Skip to content

Commit 8924a23

Browse files
ntfschr-chromiumChromium LUCI CQ
authored and
Chromium LUCI CQ
committed
Code inclusion: update URLs for main branch
No change to logic. This updates git URLs and other docs to refer to the "main" branch ("master" was renamed). This is mostly a trivial mechanical change, with a couple exceptions: * It looks like some codesearch URLs use an old unsupported format for permalinks. I've manually updated these to use the new format with corrected line numbers on the "main" branch. * I changed one GitHub link to point to the public AOSP codesearch instance which Google maintains. I manually verified each of these links works as expected. This intentionally does not convert all references to "master" because some of these refer to Android master branch, which has not yet been renamed. Test: manually checked each link Change-Id: I7b2f0b87e94ed6e0471fc5bb90e6a18be632ec99 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2869467 Commit-Queue: Nate Fischer <[email protected]> Commit-Queue: Oksana Zhuravlova <[email protected]> Auto-Submit: Nate Fischer <[email protected]> Reviewed-by: Oksana Zhuravlova <[email protected]> Cr-Commit-Position: refs/heads/master@{#878666}
1 parent f0e5cb8 commit 8924a23

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

android_webview/DIR_METADATA

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Metadata information for this directory.
22
#
33
# For more information on DIR_METADATA files, see:
4-
# https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/README.md
4+
# https://source.chromium.org/chromium/infra/infra/+/main:go/src/infra/tools/dirmd/README.md
55
#
66
# For the schema of this file, see Metadata message:
7-
# https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/proto/dir_metadata.proto
7+
# https://source.chromium.org/chromium/infra/infra/+/main:go/src/infra/tools/dirmd/proto/dir_metadata.proto
88

99
monorail {
1010
component: "Mobile>WebView"

android_webview/docs/aosp-system-integration.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ called `TrichromeWebView.apk`, `TrichromeChrome.aab`, and
127127
### Choosing a WebView version
128128

129129
WebView follows the same branching and release model as the rest of the Chromium
130-
project: a beta version is branched from the master branch approximately every
130+
project: a beta version is branched from the main branch approximately every
131131
six weeks, and after approximately six weeks of beta testing it is released to
132132
stable. If critical security or functionality issues are discovered after the
133133
stable release, a new version may be released from the same stable branch at any
@@ -144,7 +144,7 @@ to check out the desired release tag.
144144

145145
If you're intending to build WebView just in order to develop, modify, or
146146
customise it, it's usually best to work directly on the latest version of the
147-
master branch. Chromium's master branch is covered by a large number of
147+
main branch. Chromium's main branch is covered by a large number of
148148
automated build and test systems that ensure it is sufficiently stable for
149149
development purposes at almost all times.
150150

android_webview/docs/commandline-flags.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@ WebView also defines its own flags and Features:
145145
[`aw_switches.cc`](/android_webview/common/aw_switches.cc). We use
146146
[`java_cpp_strings`](/docs/android_accessing_cpp_switches_in_java.md) to
147147
automatically generate Java switch constants from the C++ switches (see
148-
[`AwSwitches.java`](https://source.chromium.org/chromium/chromium/src/+/master:out/android-Debug/gen/android_webview/common_java/generated_java/input_srcjars/org/chromium/android_webview/common/AwSwitches.java)).
148+
[`AwSwitches.java`](https://source.chromium.org/chromium/chromium/src/+/main:out/android-Debug/gen/android_webview/common_java/generated_java/input_srcjars/org/chromium/android_webview/common/AwSwitches.java)).
149149
* C++ `base::Features` are defined in
150150
[`aw_features.cc`](/android_webview/common/aw_features.cc). We use
151151
[`java_cpp_features`](/docs/android_accessing_cpp_features_in_java.md) to
152152
automatically generate Java constants from the C++ Features (see
153-
[`AwFeatures.java`](https://source.chromium.org/chromium/chromium/src/+/master:out/android-Debug/gen/android_webview/common_java/generated_java/input_srcjars/org/chromium/android_webview/common/AwFeatures.java)).
153+
[`AwFeatures.java`](https://source.chromium.org/chromium/chromium/src/+/main:out/android-Debug/gen/android_webview/common_java/generated_java/input_srcjars/org/chromium/android_webview/common/AwFeatures.java)).
154154

155155
## Implementation
156156

android_webview/docs/how-does-on-create-window-work.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ window.open("www.example.com");
4646
## What happened under the hood
4747

4848
1. When the parent WebView loads the web page and runs the JavaScript snippet,
49-
[`AwWebContentsDelegate::AddNewContents`](https://source.chromium.org/chromium/chromium/src/+/master:android_webview/browser/aw_web_contents_delegate.h;drc=a418951d0e0939a779baf00842b77806ba2c2fda;l=44)
49+
[`AwWebContentsDelegate::AddNewContents`](https://source.chromium.org/chromium/chromium/src/+/main:android_webview/browser/aw_web_contents_delegate.h;l=43;drc=3abb32da2944ffe178dd66f404e7e1bb88a58ed0)
5050
will be called. The corresponding Java side
51-
[`AwWebContentsDelegate#addNewContents`](https://source.chromium.org/chromium/chromium/src/+/master:android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java;drc=c3df19e6cd403bebb24b7418b441c861332fbfda;l=29)
51+
[`AwWebContentsDelegate#addNewContents`](https://source.chromium.org/chromium/chromium/src/+/main:android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java;l=30;drc=a19051603849d7810b3569daf158aceb23aad1da)
5252
is called from the native.
5353

5454
1. At the same time,
55-
[`AwContents::SetPendingWebContentsForPopup`](https://source.chromium.org/chromium/chromium/src/+/master:android_webview/browser/aw_contents.cc;drc=f32bfd577cabaabfb08dfa06ce2317ac65cb8aab;l=1072)
55+
[`AwContents::SetPendingWebContentsForPopup`](https://source.chromium.org/chromium/chromium/src/+/main:android_webview/browser/aw_contents.cc;l=1099;drc=7776bbb38c4e394b5be085bc8c5bc02df5fa22dc)
5656
creates native popup AwContents with the given `WebContents` and stores it as
5757
`pending_contents_` in the parent `AwContents` object without Java
5858
counterpart created. Note that since `pending_contents_` can only store one
@@ -64,13 +64,13 @@ window.open("www.example.com");
6464

6565
1. `WebViewContentsClientAdapter` has a handler that receives the message sent
6666
from `resultMsg.sendToTarget()`. It will trigger
67-
[`WebViewChromium#completeWindowCreation`](https://source.chromium.org/chromium/chromium/src/+/master:android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java;drc=8988f749860f6299bab8d76a89e56134ccdf4bdb;l=268),
67+
[`WebViewChromium#completeWindowCreation`](https://source.chromium.org/chromium/chromium/src/+/main:android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java;l=265;drc=da3bb54157d4603b9c820d6cfdf61859f804dfb2),
6868
then
69-
[`AwContents#supplyContentsForPopup`](https://source.chromium.org/chromium/chromium/src/+/master:android_webview/java/src/org/chromium/android_webview/AwContents.java;drc=83df35b1f2713897ff958dab849d103438f4457a;l=1300)
69+
[`AwContents#supplyContentsForPopup`](https://source.chromium.org/chromium/chromium/src/+/main:android_webview/java/src/org/chromium/android_webview/AwContents.java;l=1455;drc=4afe92995db1279895f8a40b69c374bc298d750f)
7070
is called on the parent WebView/AwContents.
7171

7272
1. `AwContents#supplyContentsForPopup` calls
73-
[`AwContents#receivePopupContents`](https://source.chromium.org/chromium/chromium/src/+/master:android_webview/java/src/org/chromium/android_webview/AwContents.java;drc=83df35b1f2713897ff958dab849d103438f4457a;l=1319)
73+
[`AwContents#receivePopupContents`](https://source.chromium.org/chromium/chromium/src/+/main:android_webview/java/src/org/chromium/android_webview/AwContents.java;l=1475;drc=4afe92995db1279895f8a40b69c374bc298d750f)
7474
on the child WebView/AwContents. Child AwContents deletes the existing native
7575
AwContents from the child WebView/AwContents, and pairs it with the
7676
`pending_contents_` from the parent WebView/AwContents. In order to preserve

android_webview/docs/quick-start.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public OS versions (see [note](#Building-for-preview-Android-releases)).
136136

137137
*** note
138138
**Note:** we only support local development using the latest revision of the
139-
master branch. Checking out release branches introduces a lot of complexity, and
139+
main branch. Checking out release branches introduces a lot of complexity, and
140140
it might not even be possible to build WebView for your device.
141141
***
142142

android_webview/docs/threading.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ are not held off include:
6666
Views in android are expected to be created and used on its single **view**
6767
thread, unless otherwise noted in the API. For WebView, this is enforced for
6868
apps targeting JB MR2 or above. The code lives in the
69-
[WebView](https://github.com/android/platform_frameworks_base/blob/master/core/java/android/webkit/WebView.java).
69+
[WebView](https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/android/webkit/WebView.java).
7070
Note this is an orthogonal concern to the single **UI** thread described above,
7171
as this check still allows different WebViews to be used on different **view**
7272
threads.

android_webview/nonembedded/java/src/org/chromium/android_webview/nonembedded/AwNonembeddedUmaRecorder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void recordSparseHistogram(String name, int sample) {
134134

135135
/**
136136
* Records a user action. Action names must be documented in {@code actions.xml}. See {@link
137-
* https://source.chromium.org/chromium/chromium/src/+/master:tools/metrics/actions/README.md}
137+
* https://source.chromium.org/chromium/chromium/src/+/main:tools/metrics/actions/README.md}
138138
*
139139
* @param name Name of the user action.
140140
* @param elapsedRealtimeMillis Value of {@link android.os.SystemClock.elapsedRealtime()} when

android_webview/tools/generate_flag_labels.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def main():
245245
case-sensitive!), add these to enums.xml, run `git-cl format`, and then follow
246246
these steps as a final check:
247247
248-
https://chromium.googlesource.com/chromium/src/+/master/tools/metrics/histograms/README.md#flag-histograms
248+
https://chromium.googlesource.com/chromium/src/+/main/tools/metrics/histograms/README.md#flag-histograms
249249
250250
If any labels were generated incorrectly, please edit this script and change
251251
KNOWN_MISTAKES.

android_webview/tools/remove_preinstalled_webview.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def RemovePreinstalledWebViews(device):
9393
# get lost.
9494
logging.error('Did you start the emulator with "-writable-system?"\n'
9595
'See https://chromium.googlesource.com/chromium/src/+/'
96-
'master/docs/android_emulator.md#writable-system-partition'
96+
'main/docs/android_emulator.md#writable-system-partition'
9797
'\n')
9898
raise
9999
device.SetWebViewFallbackLogic(False) # Allow standalone WebView on N+

0 commit comments

Comments
 (0)