bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 104.0.5112.0 (#1012729)

Browse Source 
- Mac: 10.13 is now the minimum required macOS version
This commit is contained in:
Marshall Greenblatt
2022-06-17 16:28:55 +03:00
parent 35654cd709
commit c7ea0c5958
96 changed files with 659 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
patch/patches/chrome_browser_profile_menu.patch
View File

@@ -1,18 +1,3 @@
diff --git chrome/browser/profiles/profile_window.cc chrome/browser/profiles/profile_window.cc
index 08865f78806a7..1a516328eaff6 100644
--- chrome/browser/profiles/profile_window.cc
+++ chrome/browser/profiles/profile_window.cc
@@ -282,7 +282,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
*bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
return;
case BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT:
- *bubble_view_mode = profile->IsIncognitoProfile()
+ *bubble_view_mode = profile->IsIncognitoProfile() ||
+ (profile->IsOffTheRecord() &&
+ profile->GetOTRProfileID().IsUniqueForCEF())
? profiles::BUBBLE_VIEW_MODE_INCOGNITO
: profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
}
diff --git chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
index 4569d0afcb80a..5af2fb12f1d7a 100644
--- chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
@@ -54,17 +39,17 @@ index 34949452d4891..43aa445b5ac3f 100644
base::RecordAction(base::UserMetricsAction("IncognitoMenu_Show"));
diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
index fa2b003a6ce6c..c1b78780fb56e 100644
index 001e5831a0512..a0a6073c64ed8 100644
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -511,7 +511,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode,
@@ -508,7 +508,9 @@ void ProfileMenuViewBase::ShowBubble(views::Button* anchor_button,
feature_engagement::kIPHProfileSwitchFeature);
ProfileMenuViewBase* bubble = nullptr;
if (view_mode == profiles::BUBBLE_VIEW_MODE_INCOGNITO) {
- DCHECK(browser->profile()->IsIncognitoProfile());
+ DCHECK(browser->profile()->IsIncognitoProfile() ||
+ (browser->profile()->IsOffTheRecord() &&
+ browser->profile()->GetOTRProfileID().IsUniqueForCEF()));
- if (browser->profile()->IsIncognitoProfile()) {
+ if (browser->profile()->IsIncognitoProfile() ||
+ (browser->profile()->IsOffTheRecord() &&
+ browser->profile()->GetOTRProfileID().IsUniqueForCEF())) {
bubble = new IncognitoMenuView(anchor_button, browser);
} else {
#if BUILDFLAG(IS_CHROMEOS_ASH)