AUTOMATED - git apply results
This commit is contained in:
parent
746223d30d
commit
ac6a673b07
188 changed files with 190 additions and 190 deletions
|
@ -252,5 +252,5 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h
|
|||
MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup;
|
||||
MEDIA_EXPORT extern const base::Feature kCanPlayHls;
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -34,5 +34,5 @@ diff --git a/components/background_task_scheduler/internal/android/java/src/org/
|
|||
persistableBundle.putDouble(key, (Double) obj);
|
||||
} else if (obj instanceof double[]) {
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -211,5 +211,5 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/th
|
|||
#define CONFIG_RD_DEBUG 0
|
||||
#define CONFIG_REALTIME_ONLY 1
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -165,5 +165,5 @@ diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/j
|
|||
isIssuedByKnownRoot, verifiedChain);
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -19,5 +19,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
|
|||
|
||||
KeyboardShortcutGroup webpageShortcutGroup = new KeyboardShortcutGroup(
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -962,5 +962,5 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
|||
};
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -1027,5 +1027,5 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
|||
&yahoo,
|
||||
&duckduckgo,
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -93,5 +93,5 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
|
|||
// ERR_CLEARTEXT_NOT_PERMITTED if not.
|
||||
if (request->context()->check_cleartext_permitted() &&
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -97,5 +97,5 @@ diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
|
|||
extern const char kInstallChromeApp[];
|
||||
extern const char kInstantProcess[];
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -1382,5 +1382,5 @@ diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_co
|
|||
// Returns one of {&proxies_for_http, &proxies_for_https, &proxies_for_ftp,
|
||||
// &fallback_proxies}, or NULL if there is no proxy to use.
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -743,5 +743,5 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
|
|||
extern const char kPrivacyGuideViewed[];
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -1784,5 +1784,5 @@ diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/se
|
|||
~SelectFileDialogImpl() override;
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -217,5 +217,5 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
<!-- Autofill Assistant preferences -->
|
||||
<!-- TODO(b/168178344): Move to Assistant settings strings section below. -->
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -128,5 +128,5 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
Appearance
|
||||
</message>
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -134,5 +134,5 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
|
|||
FixupPort(trimmed, parts.port, &url);
|
||||
FixupPath(trimmed, parts.path, &url);
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -94,5 +94,5 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
|
|||
extern const base::Feature kTrustTokens;
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -153,5 +153,5 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
|
|||
}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -69,5 +69,5 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
|
|||
|
||||
// Experimental: Try to avoid destroying the media player when transferring a
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -152,5 +152,5 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
|
|||
COMPONENT_EXPORT(NETWORK_CPP)
|
||||
extern const base::Feature kThrottleDelayable;
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -49,5 +49,5 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
|
|||
|
||||
extern const char kForceColorProfileName[];
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -51,5 +51,5 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
|
|||
extern const char kQueryTilesEnableQueryEditingName[];
|
||||
extern const char kQueryTilesEnableQueryEditingDescription[];
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -153,5 +153,5 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
|||
name: "OriginIsolationHeader",
|
||||
status: "stable",
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -1788,5 +1788,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
|||
sources += [
|
||||
"../browser/android/bookmarks/partner_bookmarks_shim_unittest.cc",
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -696,5 +696,5 @@ diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/compo
|
|||
return sync_pb::BookmarkSpecifics::FOLDER;
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -122,5 +122,5 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
Unsupported
|
||||
</message>
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -98,5 +98,5 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
|||
}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -196,5 +196,5 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
|
|||
}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -110,5 +110,5 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
LINK
|
||||
</message>
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -202,5 +202,5 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
|
|||
extern const char kAllowDeletingBrowserHistory[];
|
||||
extern const char kForceGoogleSafeSearch[];
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -1360,5 +1360,5 @@ diff --git a/third_party/blink/renderer/platform/graphics/gpu/webgl_image_conver
|
|||
|
||||
} // namespace blink
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -48,5 +48,5 @@ diff --git a/components/browser_ui/settings/android/java/src/org/chromium/compon
|
|||
+ }
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -430,5 +430,5 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
|
|||
HeapMojoReceiver<mojom::blink::ReportingObserver, ReportingContext> receiver_;
|
||||
};
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -450,5 +450,5 @@ diff --git a/components/history/core/common/pref_names.h b/components/history/co
|
|||
} // namespace prefs
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -50,5 +50,5 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
|
|||
|
||||
if (using_media_player_renderer_ &&
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -20,5 +20,5 @@ diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/
|
|||
|
||||
// static
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -33,5 +33,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
|
|||
if (isCancelled()) return null;
|
||||
Provider provider = AppHooks.get().getCustomizationProvider();
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -247,5 +247,5 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
|
|||
if (mDialogDelegate == null) {
|
||||
mState = State.NOT_SHOWING;
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -21,5 +21,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
|
|||
String homepagePartnerDefaultUri = SharedPreferencesManager.getInstance().readString(
|
||||
ChromePreferenceKeys.HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_URI, "");
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -58,5 +58,5 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
Close Incognito tabs
|
||||
</message>
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -58,5 +58,5 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir
|
|||
|
||||
MediaElementAudioSourceNode* AudioContext::createMediaElementSource(
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -62,5 +62,5 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
|
|||
|
||||
void BatteryManager::RegisterWithDispatcher() {
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -211,5 +211,5 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.h b/
|
|||
|
||||
// Returns true if |protocol| is a valid WebSocket subprotocol name.
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -280,5 +280,5 @@ diff --git a/url/url_util.cc b/url/url_util.cc
|
|||
|
||||
// Schemes that can be sent CORS requests.
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -1856,5 +1856,5 @@ diff --git a/content/browser/renderer_host/navigation_throttle_runner.cc b/conte
|
|||
|
||||
NavigationThrottle* NavigationThrottleRunner::GetDeferringThrottle() const {
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -1400,5 +1400,5 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
New window
|
||||
</message>
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -30,5 +30,5 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
|
|||
<< ", multiple_routes: " << port_config.enable_multiple_routes
|
||||
<< ", nonproxied_udp: " << port_config.enable_nonproxied_udp
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -1101,5 +1101,5 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
|
|||
}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -32,5 +32,5 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
|
|||
.put(ChromeFeatureList.OPTIMIZATION_GUIDE_PUSH_NOTIFICATIONS, false)
|
||||
.put(ChromeFeatureList.APP_TO_WEB_ATTRIBUTION, false)
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -55,5 +55,5 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/access
|
|||
final ViewStructure viewRoot = structure.asyncNewChild(0);
|
||||
viewRoot.setClassName("");
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -46,5 +46,5 @@ diff --git a/components/signin/features.gni b/components/signin/features.gni
|
|||
-enable_mirror = is_android || is_chromeos_ash || is_chromeos_lacros || is_ios
|
||||
+enable_mirror = false
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -19,5 +19,5 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
|
|||
// Determines if MediaDrmOriginIdManager should attempt to pre-provision origin
|
||||
// IDs at startup (whenever a profile is loaded). Also used by tests that
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -515,5 +515,5 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
|||
{
|
||||
name: "IntersectionObserverDocumentScrollingElementRoot",
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -43,5 +43,5 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
|
|||
const base::Feature kOptionalImagesEnabledFeature{
|
||||
"NTPRemoteSuggestionsOptionalImages", base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -186,5 +186,5 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
|||
base::FEATURE_DISABLED_BY_DEFAULT
|
||||
#endif
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -30,5 +30,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
|
|||
|
||||
private boolean maybeShowPromo() {
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -19,5 +19,5 @@ diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chro
|
|||
|
||||
/** Checks whether proactive help is enabled. */
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -345,5 +345,5 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
|||
{
|
||||
name: "CooperativeScheduling"
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -57,5 +57,5 @@ diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature
|
|||
const base::Feature kInterestFeedV2Autoplay{"InterestFeedV2Autoplay",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -216,5 +216,5 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
|
|||
|
||||
last_request_was_http_retry_ = is_http_retry;
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -17,5 +17,5 @@ diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/c
|
|||
+ registry->RegisterBooleanPref(omnibox::kLockIconInAddressBarEnabled, true);
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -78,5 +78,5 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
|
|||
registry->RegisterBooleanPref(prefs::kShowCastIconInToolbar, false);
|
||||
#endif // !defined(OS_ANDROID)
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -96,5 +96,5 @@ diff --git a/components/ntp_tiles/most_visited_sites.cc b/components/ntp_tiles/m
|
|||
if (!current_tiles_.has_value() || (*current_tiles_ != fixed_tiles)) {
|
||||
current_tiles_.emplace(std::move(fixed_tiles));
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -19,5 +19,5 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
|
|||
}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -20,5 +20,5 @@ diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/
|
|||
const base::Feature kOfflineIndicatorFeature{"OfflineIndicator",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -45,5 +45,5 @@ diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatte
|
|||
|
||||
const FormatUrlType kFormatUrlOmitDefaults =
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -23,5 +23,5 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
|
|||
|
||||
void LocalFrame::SetAdTrackerForTesting(AdTracker* ad_tracker) {
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -139,5 +139,5 @@ diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc b/chrome
|
|||
if (pref_service_->GetBoolean(prefs::kPrivacySandboxPreferencesReconciled)) {
|
||||
LogPrivacySandboxState();
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -59,5 +59,5 @@ diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/th
|
|||
body,
|
||||
table,
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -25,5 +25,5 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/c
|
|||
|
||||
ChromeOmniboxNavigationObserver::~ChromeOmniboxNavigationObserver() {
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -2900,5 +2900,5 @@ diff --git a/weblayer/test/BUILD.gn b/weblayer/test/BUILD.gn
|
|||
"//components/safe_browsing/core/browser:token_fetcher",
|
||||
"//components/safe_browsing/core/common",
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -121,5 +121,5 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati
|
|||
{
|
||||
"platforms": [
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -28,5 +28,5 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
|
|||
// Whether to send a ping to the inner URL upon navigation or not.
|
||||
const base::Feature kSignedHTTPExchangePingValidity{
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -92,5 +92,5 @@ diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/service
|
|||
std::move(callback).Run(results);
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -103,5 +103,5 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
|||
{
|
||||
name: "TextFragmentTapOpensContextMenu",
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -31,5 +31,5 @@ diff --git a/chrome/browser/media/router/discovery/dial/dial_registry.cc b/chrom
|
|||
ClearDialService();
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -19,5 +19,5 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo
|
|||
}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -257,5 +257,5 @@ diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.
|
|||
|
||||
bool OriginTrialContext::IsFeatureEnabled(OriginTrialFeature feature) const {
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -38,5 +38,5 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
|
|||
}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -53,5 +53,5 @@ diff --git a/services/metrics/public/cpp/ukm_recorder.cc b/services/metrics/publ
|
|||
UkmRecorder::UkmRecorder() = default;
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -19,5 +19,5 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
|
|||
#if defined(OS_LINUX)
|
||||
// Enable vaapi video decoding on linux. This is already enabled by default on
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -21,5 +21,5 @@ diff --git a/components/component_updater/android/java/src/org/chromium/componen
|
|||
|
||||
/* package */ void onStartTaskBeforeNativeLoaded(TaskFinishedCallback callback) {
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -19,5 +19,5 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
|||
"startup/infobar_utils.h",
|
||||
"startup/launch_mode_recorder.cc",
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -100,5 +100,5 @@ diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/shar
|
|||
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotTask.java",
|
||||
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java",
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -22,5 +22,5 @@ diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
|
|||
|
||||
Extension::ManifestData* Extension::GetManifestData(const std::string& key)
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -37,5 +37,5 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
|
|||
if (mDialogModel != null) return;
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -23,5 +23,5 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
|
|||
registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
|
||||
PrefRegistry::NO_REGISTRATION_FLAGS);
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -42,5 +42,5 @@ diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/
|
|||
}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -252,5 +252,5 @@ diff --git a/services/network/sct_auditing/sct_auditing_cache.cc b/services/netw
|
|||
SetPeriodicMetricsEnabled(enabled);
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -19,5 +19,5 @@ diff --git a/components/external_intents/android/external_intents_features.cc b/
|
|||
static jlong JNI_ExternalIntentsFeatures_GetFeature(JNIEnv* env, jint ordinal) {
|
||||
return reinterpret_cast<jlong>(kFeaturesExposedToJava[ordinal]);
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -35,5 +35,5 @@ diff --git a/components/site_isolation/features.cc b/components/site_isolation/f
|
|||
"strict_site_isolation_threshold_mb";
|
||||
const char kPartialSiteIsolationMemoryThresholdParamName[] =
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -61,5 +61,5 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
|
|||
// Enables subresource loading with Web Bundles.
|
||||
const base::Feature kSubresourceWebBundles{"SubresourceWebBundles",
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -33,5 +33,5 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
|
|||
const base::Feature kQuickActionSearchWidgetAndroidDinoVariant{
|
||||
"QuickActionSearchWidgetAndroidDinoVariant",
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -54,5 +54,5 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
|||
if (fatal_linker_warnings && !is_apple && current_os != "aix" &&
|
||||
current_os != "zos") {
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -848,5 +848,5 @@ diff --git a/weblayer/browser/tab_impl.cc b/weblayer/browser/tab_impl.cc
|
|||
|
||||
#endif // defined(OS_ANDROID)
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -52,5 +52,5 @@ diff --git a/net/base/features.cc b/net/base/features.cc
|
|||
const base::Feature kExpectCTPruning{"ExpectCTPruning",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -19,5 +19,5 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
|||
// Decodes jpeg 4:2:0 formatted images to YUV instead of RGBX and stores in this
|
||||
// format in the image decode cache. See crbug.com/919627 for details on the
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -414,5 +414,5 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
|||
<message name="IDS_SMS_FETCHER_NOTIFICATION_TITLE" desc="Title text shown when the Android Chrome receives a ONE_TIME_CODE from an incoming SMS and ask users for permission to submit the code to their linked Desktop Chrome">
|
||||
Submit <ph name="ONE_TIME_CODE">%1$s<ex>123</ex></ph> on <ph name="CLIENT_NAME">%2$s<ex>Zoe's Macbook</ex></ph>?
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -19,5 +19,5 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
|||
// Enables the frequency capping for detecting overlay popups. Overlay-popups
|
||||
// are the interstitials that pop up and block the main content of the page.
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -10724,5 +10724,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_
|
|||
|
||||
# START ios/ section.
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
|
@ -35,5 +35,5 @@ diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoade
|
|||
&& Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
2.25.1
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue