Update patches from Chromium 148.0.7778.96 to Chromium 148.0.7778.167.
This commit is contained in:
+1
-1
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
index f872f7819bc7e16bdd16f663295ae52c46098195..3222e9559258594290fc367542195fdc1a54ef7c 100644
|
||||
index 6b939b9be89afa29936d502abeefb5756b41fea6..e252c74d54f7bb04a9ee7c5e12f0d54893df0ff1 100644
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
|
||||
@@ -1862,7 +1862,7 @@ public class ToolbarManager
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
index 659379c7d74a1772b3d6cecff80be92e9cc4a4ea..1fcae945ff75b1389afeeb14a032136ae9aca834 100644
|
||||
index 98d6f67176e1bbc38b6efb3ba0863be60652d3ac..8aca892c28c55b3f8ed71f15e3a8fddd930acccb 100644
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4651,6 +4651,7 @@ const FeatureEntry::FeatureVariation
|
||||
@@ -4682,6 +4682,7 @@ const FeatureEntry::FeatureVariation
|
||||
//
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
const FeatureEntry kFeatureEntries[] = {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/notifications/notification_display_service_impl.cc b/chrome/browser/notifications/notification_display_service_impl.cc
|
||||
index c185575c57d0f0e72edc3c9bcfc5874e4c2a63dd..0632480d7827cf594eb696db0237068e6c3ccd32 100644
|
||||
index c185575c57d0f0e72edc3c9bcfc5874e4c2a63dd..44d18329a2433d73e5f49e805d2b26f234eb13f7 100644
|
||||
--- a/chrome/browser/notifications/notification_display_service_impl.cc
|
||||
+++ b/chrome/browser/notifications/notification_display_service_impl.cc
|
||||
@@ -124,6 +124,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/ui/tabs/tab_strip_prefs.cc b/chrome/browser/ui/tabs/tab_strip_prefs.cc
|
||||
index 67ac393bd49235493ebbbf345e1cf6e5270e1ae2..f5e71e9040196cd605a8f3751402ca17a5ceae82 100644
|
||||
index 3e21f5863698935b24c1159116ab22cf23562418..2f5ee8ca567bd39c93972fba1a6519d3752439be 100644
|
||||
--- a/chrome/browser/ui/tabs/tab_strip_prefs.cc
|
||||
+++ b/chrome/browser/ui/tabs/tab_strip_prefs.cc
|
||||
@@ -27,6 +27,7 @@ std::optional<bool> g_tab_search_trailing_tabstrip_at_startup = std::nullopt;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
index 987c59be280091d959c1b78f92edd83c4cfa8407..307a9004c22fa41037649bc584f15cc69afe78cf 100644
|
||||
index 5256a5d9de45aea246d5e4fc3f4dde836ae0cf64..b6b4d4a6f1a43e0efa70fd5567d985e5e77615c6 100644
|
||||
--- a/chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -628,6 +628,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) {
|
||||
@@ -629,6 +629,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) {
|
||||
DCHECK(src);
|
||||
DCHECK(dst);
|
||||
DCHECK(point);
|
||||
@@ -10,7 +10,7 @@ index 987c59be280091d959c1b78f92edd83c4cfa8407..307a9004c22fa41037649bc584f15cc6
|
||||
views::View::ConvertPointToTarget(src, dst, point);
|
||||
return dst->HitTestPoint(*point);
|
||||
}
|
||||
@@ -1971,6 +1972,7 @@ void BrowserView::OnActiveTabChanged(content::WebContents* old_contents,
|
||||
@@ -1972,6 +1973,7 @@ void BrowserView::OnActiveTabChanged(content::WebContents* old_contents,
|
||||
!browser_->tab_strip_model()->closing_all() && GetWidget()->IsActive() &&
|
||||
GetWidget()->IsVisible() && !tab_change_in_split_view;
|
||||
#endif
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
|
||||
index 1a4b5e1c055223b5b81b8f38bf07c1ed980d8149..6d44d2253b5d9c1e20984dc16aabd39dd7cb478f 100644
|
||||
index c0d3839e9bbece6d64949b36d56c59a8f219ad5b..21b5ea9e2d69286d2708b814e84f75abbe1f27db 100644
|
||||
--- a/components/omnibox/browser/autocomplete_controller.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_controller.cc
|
||||
@@ -1300,6 +1300,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
index 2bacb736c7a3e1fb70ec590883c87ce667e461e1..c2e839ec2c6b92b97f513daed965aac41e2f387d 100644
|
||||
index 735febe0f136d4a747d8374ccbc5477645d22e40..5b384bcb00a0412fe0bf6a098f2802253ddc6f22 100644
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -5532,6 +5532,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal(
|
||||
@@ -5536,6 +5536,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal(
|
||||
candidate_site_for_cookies = net::SiteForCookies(top_frame_site);
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ index 2bacb736c7a3e1fb70ec590883c87ce667e461e1..c2e839ec2c6b92b97f513daed965aac4
|
||||
std::optional<base::UnguessableToken> nonce =
|
||||
ComputeNonce(is_credentialless, fenced_frame_nonce_for_navigation);
|
||||
return net::IsolationInfo::Create(
|
||||
@@ -5543,6 +5544,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal(
|
||||
@@ -5547,6 +5548,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal(
|
||||
std::optional<base::UnguessableToken> RenderFrameHostImpl::ComputeNonce(
|
||||
bool is_credentialless,
|
||||
std::optional<base::UnguessableToken> fenced_frame_nonce_for_navigation) {
|
||||
@@ -18,7 +18,7 @@ index 2bacb736c7a3e1fb70ec590883c87ce667e461e1..c2e839ec2c6b92b97f513daed965aac4
|
||||
// If it's a credentialless frame tree, use its nonce even if it's within a
|
||||
// fenced frame tree to maintain the guarantee that a credentialless frame
|
||||
// tree has a unique nonce.
|
||||
@@ -10293,6 +10295,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||
@@ -10315,6 +10317,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||
dom_storage_context, params->session_storage_namespace_id);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm
|
||||
index 224bd6d9239c92a7dd3aa0d182c7bc3ce9ad78fe..4723a94aa5e3db34de56fe9ed25ea493d2853c71 100644
|
||||
index 6af162b79d2cf45402b0dfd6995197ada92d29a3..780001614e64e31a89d53f73923f0d253fc100d8 100644
|
||||
--- a/ios/chrome/browser/flags/about_flags.mm
|
||||
+++ b/ios/chrome/browser/flags/about_flags.mm
|
||||
@@ -1354,6 +1354,7 @@ const FeatureEntry::FeatureVariation kAssistantContainerVariations[] = {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/ios/chrome/browser/sync/model/sync_service_factory.mm b/ios/chrome/browser/sync/model/sync_service_factory.mm
|
||||
index 904aaf1326e54e44ffc3c4d13a05972dfa4312dd..e442249b6259dc9be221c2d522ac3c4d4fa6d50f 100644
|
||||
index e6cc9a124392044742ac04c502c08c56f0c2470a..b563ed25178bd37d7d81e37c1789e0af1e9ae787 100644
|
||||
--- a/ios/chrome/browser/sync/model/sync_service_factory.mm
|
||||
+++ b/ios/chrome/browser/sync/model/sync_service_factory.mm
|
||||
@@ -223,7 +223,7 @@ std::unique_ptr<KeyedService> BuildSyncService(ProfileIOS* profile) {
|
||||
@@ -229,7 +229,7 @@ std::unique_ptr<KeyedService> BuildSyncService(ProfileIOS* profile) {
|
||||
init_params.debug_identifier = profile->GetProfileName();
|
||||
init_params.os_crypt_async = GetApplicationContext()->GetOSCryptAsync();
|
||||
auto sync_service =
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/ui/base/clipboard/clipboard_ozone.cc b/ui/base/clipboard/clipboard_ozone.cc
|
||||
index 0dd321f1e8c858278ee9e2def979743607776179..2f798865a5e9a7e35a447e31577b0901e9d1afb7 100644
|
||||
index 3255402bbdd1adc21633c27685b6cf3c965b6b16..14b1d72741c2b3c03057f98821e2bcfc2ec30fac 100644
|
||||
--- a/ui/base/clipboard/clipboard_ozone.cc
|
||||
+++ b/ui/base/clipboard/clipboard_ozone.cc
|
||||
@@ -176,7 +176,7 @@ class ClipboardOzone::AsyncClipboardOzone {
|
||||
@@ -177,7 +177,7 @@ class ClipboardOzone::AsyncClipboardOzone {
|
||||
auto wrapped_data =
|
||||
base::MakeRefCounted<base::RefCountedBytes>(std::move(data));
|
||||
for (const auto& mime_type : mime_types) {
|
||||
|
||||
Reference in New Issue
Block a user