Patches for 148.0.7778.168
This commit is contained in:
@@ -2111,7 +2111,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@@ -521,6 +526,9 @@ class LocationBarMediator
|
||||
@@ -522,6 +527,9 @@ class LocationBarMediator
|
||||
if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mContext)) return;
|
||||
Tab tab = mLocationBarDataProvider.getTab();
|
||||
if (tab == null) return;
|
||||
@@ -2226,7 +2226,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
|
||||
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
|
||||
--- a/chrome/common/pref_names.h
|
||||
+++ b/chrome/common/pref_names.h
|
||||
@@ -3425,6 +3425,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
|
||||
@@ -3431,6 +3431,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
|
||||
"net.out_of_process_system_dns_resolution_enabled";
|
||||
#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
|
||||
@@ -726,7 +726,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
namespace about_flags {
|
||||
|
||||
namespace {
|
||||
@@ -4627,6 +4631,10 @@ const FeatureEntry::FeatureVariation
|
||||
@@ -4658,6 +4662,10 @@ const FeatureEntry::FeatureVariation
|
||||
kWalletApiPrivatePassesEnabledVariations[] = {
|
||||
{"Debug", kWalletApiPrivatePassesUrl, nullptr}};
|
||||
|
||||
@@ -737,7 +737,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
// RECORDING USER METRICS FOR FLAGS:
|
||||
// -----------------------------------------------------------------------------
|
||||
// The first line of the entry is the internal name.
|
||||
@@ -4653,6 +4661,9 @@ const FeatureEntry::FeatureVariation
|
||||
@@ -4684,6 +4692,9 @@ const FeatureEntry::FeatureVariation
|
||||
const FeatureEntry kFeatureEntries[] = {
|
||||
// Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
|
||||
// //tools/flags/generate_unexpire_flags.py.
|
||||
|
||||
@@ -851,7 +851,7 @@ diff --git a/content/browser/log_console_message.h b/content/browser/log_console
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -331,6 +331,8 @@
|
||||
@@ -335,6 +335,8 @@
|
||||
#include "url/origin.h"
|
||||
#include "url/url_constants.h"
|
||||
|
||||
@@ -860,7 +860,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
#include "base/android/scoped_service_binding_batch.h"
|
||||
#include "content/browser/accessibility/browser_accessibility_manager_android.h"
|
||||
@@ -5045,7 +5047,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
|
||||
@@ -5049,7 +5051,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
|
||||
if (delegate_->DidAddMessageToConsole(this, log_level, message, line_no,
|
||||
updated_source_id,
|
||||
untrusted_stack_trace)) {
|
||||
@@ -870,7 +870,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
}
|
||||
|
||||
// Pass through log severity only on builtin components pages to limit console
|
||||
@@ -5062,8 +5065,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
|
||||
@@ -5066,8 +5069,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
|
||||
const bool is_off_the_record =
|
||||
GetSiteInstance()->GetBrowserContext()->IsOffTheRecord();
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -16890,12 +16890,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
|
||||
@@ -16912,12 +16912,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -764,7 +764,7 @@ diff --git a/components/input/child_frame_input_helper.cc b/components/input/chi
|
||||
diff --git a/components/input/input_router_impl.cc b/components/input/input_router_impl.cc
|
||||
--- a/components/input/input_router_impl.cc
|
||||
+++ b/components/input/input_router_impl.cc
|
||||
@@ -618,7 +618,7 @@ bool InputRouterImpl::IsAutoscrollInProgress() {
|
||||
@@ -622,7 +622,7 @@ bool InputRouterImpl::IsAutoscrollInProgress() {
|
||||
return client_->IsAutoscrollInProgress();
|
||||
}
|
||||
|
||||
@@ -995,7 +995,7 @@ diff --git a/content/browser/renderer_host/input/touch_selection_controller_clie
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -9661,7 +9661,7 @@ void RenderFrameHostImpl::ShowPopupMenu(
|
||||
@@ -9683,7 +9683,7 @@ void RenderFrameHostImpl::ShowPopupMenu(
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -5422,7 +5422,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
|
||||
@@ -5426,7 +5426,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
|
||||
}
|
||||
|
||||
void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {
|
||||
|
||||
@@ -1708,7 +1708,7 @@ diff --git a/components/commerce/core/subscriptions/subscriptions_server_proxy.c
|
||||
diff --git a/components/contextual_search/internal/composebox_query_controller.cc b/components/contextual_search/internal/composebox_query_controller.cc
|
||||
--- a/components/contextual_search/internal/composebox_query_controller.cc
|
||||
+++ b/components/contextual_search/internal/composebox_query_controller.cc
|
||||
@@ -1209,7 +1209,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
|
||||
@@ -1226,7 +1226,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
|
||||
.SetTimeout(timeout)
|
||||
.SetUploadProgressCallback(std::move(upload_progress_callback))
|
||||
.SetUrl(fetch_url)
|
||||
|
||||
@@ -744,7 +744,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
|
||||
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
|
||||
--- a/chrome/common/pref_names.h
|
||||
+++ b/chrome/common/pref_names.h
|
||||
@@ -2410,6 +2410,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
|
||||
@@ -2416,6 +2416,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
|
||||
inline constexpr char kAudioCaptureAllowedUrls[] =
|
||||
"hardware.audio_capture_allowed_urls";
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re
|
||||
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
|
||||
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
|
||||
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
|
||||
@@ -1006,7 +1006,7 @@ class LocationBarMediator
|
||||
@@ -1007,7 +1007,7 @@ class LocationBarMediator
|
||||
// Existing text (e.g. if the user pasted via the fakebox) from the fake box
|
||||
// should be restored after toggling the focus.
|
||||
if (mCurrentInput != null && !mCurrentInput.getUserText().isEmpty()) {
|
||||
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1051,7 +1051,7 @@ class LocationBarMediator
|
||||
@@ -1052,7 +1052,7 @@ class LocationBarMediator
|
||||
*/
|
||||
@EnsuresNonNullIf("mCurrentInput")
|
||||
@VisibleForTesting
|
||||
@@ -47,7 +47,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
// Do not instantiate a new ephemeral session unless we're activating it as well.
|
||||
var session = FuseboxSessionState.from(mLocationBarDataProvider);
|
||||
|
||||
@@ -1086,6 +1086,19 @@ class LocationBarMediator
|
||||
@@ -1087,6 +1087,19 @@ class LocationBarMediator
|
||||
mStatusCoordinator.setSiteSearchDataSupplier(mCurrentInput.getSiteSearchDataSupplier());
|
||||
|
||||
UrlBarData data = UrlBarData.forNonUrlText(mCurrentInput.getUserText());
|
||||
@@ -67,7 +67,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
mUrlCoordinator.setUrlBarData(
|
||||
data, UrlBar.ScrollType.NO_SCROLL, mCurrentInput.getSelection());
|
||||
|
||||
@@ -1161,7 +1174,7 @@ class LocationBarMediator
|
||||
@@ -1162,7 +1175,7 @@ class LocationBarMediator
|
||||
// This call is permitted to happen before anyone else is activated, and
|
||||
// must be called before everyone else cleans up.
|
||||
if (hasFocus) {
|
||||
@@ -76,7 +76,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
} else {
|
||||
endInputInternal();
|
||||
}
|
||||
@@ -2064,7 +2077,7 @@ class LocationBarMediator
|
||||
@@ -2065,7 +2078,7 @@ class LocationBarMediator
|
||||
}
|
||||
|
||||
// Wait for the Url focus change before refreshing autocomplete.
|
||||
|
||||
@@ -65,7 +65,7 @@ diff --git a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.c
|
||||
diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
|
||||
--- a/components/search/ntp_features.cc
|
||||
+++ b/components/search/ntp_features.cc
|
||||
@@ -91,7 +91,7 @@ BASE_FEATURE(kNtpDriveModuleSegmentation, base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
@@ -97,7 +97,7 @@ BASE_FEATURE(kNtpDriveModuleSegmentation, base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
// If enabled, logo will be shown.
|
||||
// This is a kill switch. Keep indefinitely.
|
||||
@@ -74,7 +74,7 @@ diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.
|
||||
|
||||
// If enabled, middle slot promo will be shown.
|
||||
// This is a kill switch. Keep indefinitely.
|
||||
@@ -133,7 +133,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
@@ -139,7 +139,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
// If enabled, OneGoogleBar will be shown.
|
||||
// This is a kill switch. Keep indefinitely.
|
||||
|
||||
@@ -147,7 +147,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -8974,6 +8974,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9005,6 +9005,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(
|
||||
ntp_features::kCustomizeChromeWallpaperSearchInspirationCard)},
|
||||
|
||||
@@ -155,7 +155,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
{"wallpaper-search-settings-visibility",
|
||||
flag_descriptions::kWallpaperSearchSettingsVisibilityName,
|
||||
flag_descriptions::kWallpaperSearchSettingsVisibilityDescription,
|
||||
@@ -8981,6 +8982,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -9012,6 +9013,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(optimization_guide::features::internal::
|
||||
kWallpaperSearchSettingsVisibility)},
|
||||
#endif
|
||||
|
||||
@@ -401,7 +401,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -10897,6 +10897,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
|
||||
@@ -10919,6 +10919,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -409,7 +409,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
if (!IsActive()) {
|
||||
// reportEvent is not allowed when this RenderFrameHost or one of its
|
||||
// ancestors is not active.
|
||||
@@ -15128,6 +15129,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
|
||||
@@ -15150,6 +15151,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -16819,6 +16819,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
|
||||
@@ -16841,6 +16841,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
|
||||
void RenderFrameHostImpl::MaybeGenerateCrashReport(
|
||||
base::TerminationStatus status,
|
||||
int exit_code) {
|
||||
|
||||
@@ -490,15 +490,15 @@ diff --git a/chrome/browser/extensions/api/experimental_ai_data/experimental_ai_
|
||||
diff --git a/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn b/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn
|
||||
--- a/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn
|
||||
+++ b/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn
|
||||
@@ -18,7 +18,6 @@ source_set("pdf_viewer_private") {
|
||||
|
||||
@@ -19,7 +19,6 @@ source_set("pdf_viewer_private") {
|
||||
deps = [
|
||||
"//base",
|
||||
"//chrome/browser/extensions",
|
||||
- "//chrome/browser/glic",
|
||||
"//chrome/browser/pdf",
|
||||
"//chrome/browser/pdf:pdf_pref_names",
|
||||
"//chrome/browser/profiles:profile",
|
||||
@@ -47,8 +46,6 @@ source_set("browser_tests") {
|
||||
@@ -48,8 +47,6 @@ source_set("browser_tests") {
|
||||
sources = [ "pdf_viewer_private_browsertest.cc" ]
|
||||
deps = [
|
||||
":pdf_viewer_private",
|
||||
@@ -520,7 +520,7 @@ diff --git a/chrome/browser/extensions/api/pdf_viewer_private/pdf_viewer_private
|
||||
#include "chrome/browser/pdf/pdf_pref_names.h"
|
||||
#include "chrome/browser/pdf/pdf_viewer_stream_manager.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
@@ -53,8 +50,6 @@ namespace SetPdfPluginAttributes =
|
||||
@@ -57,8 +54,6 @@ namespace SetPdfPluginAttributes =
|
||||
|
||||
namespace SetPdfDocumentTitle = api::pdf_viewer_private::SetPdfDocumentTitle;
|
||||
|
||||
@@ -529,7 +529,7 @@ diff --git a/chrome/browser/extensions/api/pdf_viewer_private/pdf_viewer_private
|
||||
// Check if the current URL is allowed based on a list of allowlisted domains.
|
||||
bool IsUrlAllowedToEmbedLocalFiles(const GURL& current_url,
|
||||
const base::ListValue& allowlisted_domains) {
|
||||
@@ -309,43 +304,7 @@ ExtensionFunction::ResponseAction PdfViewerPrivateGlicSummarizeFunction::Run() {
|
||||
@@ -321,43 +316,7 @@ ExtensionFunction::ResponseAction PdfViewerPrivateGlicSummarizeFunction::Run() {
|
||||
return RespondNow(Error("No tab."));
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
|
||||
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -1153,7 +1153,7 @@ void ToolbarView::Update(WebContents* tab) {
|
||||
@@ -1197,7 +1197,7 @@ void ToolbarView::Update(WebContents* tab) {
|
||||
|
||||
if (ReloadControl* reload_control = GetReloadButton(); reload_control) {
|
||||
reload_control->SetDevToolsStatus(
|
||||
|
||||
@@ -1618,7 +1618,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
|
||||
diff --git a/chrome/browser/glic/public/features.cc b/chrome/browser/glic/public/features.cc
|
||||
--- a/chrome/browser/glic/public/features.cc
|
||||
+++ b/chrome/browser/glic/public/features.cc
|
||||
@@ -52,7 +52,7 @@ BASE_FEATURE(kGlicLiveMode,
|
||||
@@ -54,7 +54,7 @@ BASE_FEATURE(kGlicLiveMode,
|
||||
);
|
||||
|
||||
BASE_FEATURE(kGlicDefaultToLastActiveConversation,
|
||||
|
||||
@@ -65,7 +65,7 @@ diff --git a/components/component_updater/installer_policies/BUILD.gn b/componen
|
||||
diff --git a/components/contextual_tasks/internal/BUILD.gn b/components/contextual_tasks/internal/BUILD.gn
|
||||
--- a/components/contextual_tasks/internal/BUILD.gn
|
||||
+++ b/components/contextual_tasks/internal/BUILD.gn
|
||||
@@ -52,6 +52,7 @@ source_set("internal") {
|
||||
@@ -53,6 +53,7 @@ source_set("internal") {
|
||||
"//net",
|
||||
"//ui/gfx",
|
||||
"//url",
|
||||
|
||||
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc
|
||||
--- a/components/omnibox/browser/autocomplete_result.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_result.cc
|
||||
@@ -103,10 +103,11 @@ constexpr size_t kMaxPedalMatchIndex =
|
||||
@@ -104,10 +104,11 @@ constexpr size_t kMaxPedalMatchIndex =
|
||||
size_t AutocompleteResult::GetMaxMatches(
|
||||
bool is_zero_suggest,
|
||||
AutocompleteInput::FeaturedKeywordMode featured_keyword_mode) {
|
||||
|
||||
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/Incog
|
||||
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
|
||||
--- a/chrome/browser/flag-metadata.json
|
||||
+++ b/chrome/browser/flag-metadata.json
|
||||
@@ -5584,10 +5584,10 @@
|
||||
@@ -5608,10 +5608,10 @@
|
||||
"expiry_milestone": -1
|
||||
},
|
||||
{
|
||||
|
||||
@@ -2766,7 +2766,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
import java.util.List;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
@@ -1633,7 +1635,9 @@ class AutocompleteMediator
|
||||
@@ -1635,7 +1637,9 @@ class AutocompleteMediator
|
||||
public void onSuggestionDropdownScroll() {
|
||||
if (mAutocompleteInput == null) return;
|
||||
mAutocompleteInput.setSuggestionsListScrolled();
|
||||
@@ -3281,7 +3281,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
@@ -45,6 +46,15 @@ class TopToolbarSceneLayer extends SceneOverlayLayer {
|
||||
@@ -45,6 +46,15 @@ public class TopToolbarSceneLayer extends SceneOverlayLayer {
|
||||
/** Push all information about the texture to native at once. */
|
||||
private void pushProperties(PropertyModel model) {
|
||||
if (mResourceManagerSupplier.get() == null) return;
|
||||
@@ -3297,7 +3297,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
|
||||
TopToolbarSceneLayerJni.get()
|
||||
.updateToolbarLayer(
|
||||
mNativePtr,
|
||||
@@ -54,8 +64,8 @@ class TopToolbarSceneLayer extends SceneOverlayLayer {
|
||||
@@ -54,8 +64,8 @@ public class TopToolbarSceneLayer extends SceneOverlayLayer {
|
||||
model.get(TopToolbarOverlayProperties.URL_BAR_RESOURCE_ID),
|
||||
model.get(TopToolbarOverlayProperties.URL_BAR_COLOR),
|
||||
model.get(TopToolbarOverlayProperties.X_OFFSET),
|
||||
|
||||
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -19982,7 +19982,8 @@ RenderFrameHostImpl::GetCachedPermissionStatuses() {
|
||||
@@ -20004,7 +20004,8 @@ RenderFrameHostImpl::GetCachedPermissionStatuses() {
|
||||
{PermissionName::WEB_APP_INSTALLATION,
|
||||
PermissionType::WEB_APP_INSTALLATION},
|
||||
#endif
|
||||
|
||||
@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -13502,6 +13502,8 @@ void RenderFrameHostImpl::ReportBlockingCrossPartitionBlobURL(
|
||||
@@ -13524,6 +13524,8 @@ void RenderFrameHostImpl::ReportBlockingCrossPartitionBlobURL(
|
||||
}
|
||||
|
||||
bool RenderFrameHostImpl::IsFullCookieAccessAllowed() {
|
||||
|
||||
@@ -514,7 +514,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
updateShouldAnimateIconChanges();
|
||||
updateButtonVisibility();
|
||||
updateSearchEngineStatusIconShownState();
|
||||
@@ -402,9 +387,6 @@ class LocationBarMediator
|
||||
@@ -403,9 +388,6 @@ class LocationBarMediator
|
||||
mStatusCoordinator = null;
|
||||
mAutocompleteCoordinator = null;
|
||||
mUrlCoordinator = null;
|
||||
@@ -524,7 +524,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
mLocationBarDataProvider.removeObserver(this);
|
||||
mUrlFocusChangeListeners.clear();
|
||||
if (mPageZoomIndicatorCoordinator != null) {
|
||||
@@ -533,11 +515,6 @@ class LocationBarMediator
|
||||
@@ -534,11 +516,6 @@ class LocationBarMediator
|
||||
mLocationBarLayout.setUnfocusedWidth(unfocusedWidth);
|
||||
}
|
||||
|
||||
@@ -536,7 +536,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
/* package */ void setLensControllerForTesting(LensController lensController) {
|
||||
mLensController = lensController;
|
||||
}
|
||||
@@ -982,10 +959,6 @@ class LocationBarMediator
|
||||
@@ -983,10 +960,6 @@ class LocationBarMediator
|
||||
// Hide keyboard before launch voice search to avoid keyboard action announcement in
|
||||
// TalkBack to be picked up by voice search.
|
||||
mUrlCoordinator.setKeyboardVisibility(false, false);
|
||||
@@ -547,7 +547,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
}
|
||||
|
||||
/** package */
|
||||
@@ -1829,10 +1802,7 @@ class LocationBarMediator
|
||||
@@ -1830,10 +1803,7 @@ class LocationBarMediator
|
||||
|
||||
if (isUrlBarFocusedOnDesktop()) return false;
|
||||
|
||||
@@ -559,7 +559,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
return false;
|
||||
}
|
||||
boolean isToolbarMicEnabled = mIsToolbarMicEnabledSupplier.getAsBoolean();
|
||||
@@ -1850,6 +1820,7 @@ class LocationBarMediator
|
||||
@@ -1851,6 +1821,7 @@ class LocationBarMediator
|
||||
|
||||
@VisibleForTesting
|
||||
boolean shouldShowLensButton() {
|
||||
@@ -567,7 +567,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
if (mCurrentInput != null && !mCurrentInput.isConventionalRequestType()) return false;
|
||||
|
||||
if (isUrlBarFocusedWithUserInput()) return false;
|
||||
@@ -2124,11 +2095,6 @@ class LocationBarMediator
|
||||
@@ -2125,11 +2096,6 @@ class LocationBarMediator
|
||||
mUrlCoordinator.clearFocus();
|
||||
}
|
||||
|
||||
@@ -579,7 +579,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
@Override
|
||||
public void addUrlFocusChangeListener(UrlFocusChangeListener listener) {
|
||||
mUrlFocusChangeListeners.addObserver(listener);
|
||||
@@ -2153,20 +2119,10 @@ class LocationBarMediator
|
||||
@@ -2154,20 +2120,10 @@ class LocationBarMediator
|
||||
.build());
|
||||
}
|
||||
|
||||
|
||||
@@ -117,7 +117,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -10858,9 +10858,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -10896,9 +10896,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(::features::kBlockRootWindowAccessibleNameChangeEvent)},
|
||||
#endif // BUILDFLAG(IS_MAC)
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Temp disable experimental-web-platform-features
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4912,10 +4912,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -4943,10 +4943,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kFallbackToSWIfGLES3NotSupportedName,
|
||||
flag_descriptions::kFallbackToSWIfGLES3NotSupportedDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kFallbackToSWIfGLES3NotSupported)},
|
||||
|
||||
@@ -972,7 +972,7 @@ diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp
|
||||
diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
|
||||
--- a/components/search/ntp_features.cc
|
||||
+++ b/components/search/ntp_features.cc
|
||||
@@ -66,6 +66,7 @@ BASE_FEATURE(kNtpCalendarModule, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
@@ -72,6 +72,7 @@ BASE_FEATURE(kNtpCalendarModule, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
// If enabled, chrome cart module will be shown.
|
||||
BASE_FEATURE(kNtpChromeCartModule, base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
@@ -50232,7 +50232,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
|
||||
|
||||
#include "content/browser/renderer_host/render_frame_host_impl.h"
|
||||
|
||||
@@ -3877,6 +3881,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
|
||||
@@ -3881,6 +3885,12 @@ void RenderFrameHostImpl::ExecuteJavaScriptMethod(
|
||||
std::move(callback));
|
||||
}
|
||||
|
||||
|
||||
@@ -847,7 +847,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
import org.chromium.chrome.browser.omnibox.status.StatusCoordinator;
|
||||
import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider;
|
||||
import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
|
||||
@@ -418,22 +417,6 @@ class LocationBarMediator
|
||||
@@ -419,22 +418,6 @@ class LocationBarMediator
|
||||
|
||||
if (!mUrlFocusedWithoutAnimations) handleUrlFocusAnimation(hasFocus);
|
||||
|
||||
@@ -870,7 +870,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
if (!hasFocus && mLocationBarDataProvider.hasTab()) {
|
||||
setUrl(
|
||||
mLocationBarDataProvider.getCurrentGurl(),
|
||||
@@ -450,8 +433,6 @@ class LocationBarMediator
|
||||
@@ -451,8 +434,6 @@ class LocationBarMediator
|
||||
Profile profile = mProfileSupplier.get();
|
||||
assert profile != null;
|
||||
templateUrlService.addObserver(this);
|
||||
@@ -879,7 +879,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
}));
|
||||
|
||||
mLocationBarLayout.onFinishNativeInitialization();
|
||||
@@ -807,14 +788,6 @@ class LocationBarMediator
|
||||
@@ -808,14 +789,6 @@ class LocationBarMediator
|
||||
// ContentView.
|
||||
if (currentTab != null && !url.isEmpty()) {
|
||||
LoadUrlParams loadUrlParams = new LoadUrlParams(url);
|
||||
@@ -894,7 +894,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
loadUrlParams.setTransitionType(
|
||||
omniboxLoadUrlParams.transitionType | PageTransition.FROM_ADDRESS_BAR);
|
||||
if (omniboxLoadUrlParams.inputStartTimestamp != 0) {
|
||||
@@ -2239,7 +2212,6 @@ class LocationBarMediator
|
||||
@@ -2240,7 +2213,6 @@ class LocationBarMediator
|
||||
if (OmniboxFeatures.sUseFusedLocationProvider.isEnabled()
|
||||
&& profile != null
|
||||
&& templateUrlService != null) {
|
||||
@@ -902,7 +902,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2247,7 +2219,6 @@ class LocationBarMediator
|
||||
@@ -2248,7 +2220,6 @@ class LocationBarMediator
|
||||
public void onPauseWithNative() {
|
||||
OmniboxFeatures.updateLastExitTimestamp();
|
||||
if (OmniboxFeatures.sUseFusedLocationProvider.isEnabled()) {
|
||||
@@ -924,7 +924,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
|
||||
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
--- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.cc
|
||||
@@ -760,12 +760,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(
|
||||
@@ -767,12 +767,6 @@ content::WebUIDataSource* CreateAndAddNewTabPageUiHtmlSource(
|
||||
// chrome-untrusted://new-tab-page for other external content and resources.
|
||||
// NOTE: Use caution when overriding content security policies as that cean
|
||||
// lead to subtle security bugs such as https://crbug.com/1251541.
|
||||
|
||||
Reference in New Issue
Block a user