mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 92.0.4515.0 (#885287)
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
diff --git chrome/browser/profiles/profile_window.cc chrome/browser/profiles/profile_window.cc
|
||||
index 69d6f442d1208..46f2be62e0466 100644
|
||||
index e0010fdd55000..f89c622c6fd96 100644
|
||||
--- chrome/browser/profiles/profile_window.cc
|
||||
+++ chrome/browser/profiles/profile_window.cc
|
||||
@@ -262,7 +262,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
|
||||
@@ -273,7 +273,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
|
||||
*bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
|
||||
return;
|
||||
case BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT:
|
||||
@ -14,7 +14,7 @@ index 69d6f442d1208..46f2be62e0466 100644
|
||||
: profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
|
||||
}
|
||||
diff --git chrome/browser/ui/views/profiles/incognito_menu_view.cc chrome/browser/ui/views/profiles/incognito_menu_view.cc
|
||||
index b6ce61c8f4b03..dc5d111325b1f 100644
|
||||
index ae41e1031c95e..16ee4f7766a78 100644
|
||||
--- chrome/browser/ui/views/profiles/incognito_menu_view.cc
|
||||
+++ chrome/browser/ui/views/profiles/incognito_menu_view.cc
|
||||
@@ -37,7 +37,9 @@
|
||||
@ -29,12 +29,12 @@ index b6ce61c8f4b03..dc5d111325b1f 100644
|
||||
|
||||
chrome::RecordDialogCreation(
|
||||
diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
|
||||
index 319404417dc43..795dccb655e07 100644
|
||||
index 905c775ba0471..b1cf9288f4975 100644
|
||||
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
|
||||
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
|
||||
@@ -494,7 +494,9 @@ void ProfileMenuViewBase::ShowBubble(
|
||||
ProfileMenuViewBase* bubble;
|
||||
@@ -511,7 +511,9 @@ void ProfileMenuViewBase::ShowBubble(
|
||||
|
||||
ProfileMenuViewBase* bubble = nullptr;
|
||||
if (view_mode == profiles::BUBBLE_VIEW_MODE_INCOGNITO) {
|
||||
- DCHECK(browser->profile()->IsIncognitoProfile());
|
||||
+ DCHECK(browser->profile()->IsIncognitoProfile() ||
|
||||
|
Reference in New Issue
Block a user