bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cef/patch/patches/chrome_browser_profile_menu...

71 lines
3.8 KiB
Diff
Raw Normal View History

chrome: Fix assertion when clicking the incognito profile button (see issue #2969) Profile::IsIncognitoProfile() currently returns false for CEF incognito profiles because they are not the primary OTR profile. At the same time, we don't necessarily want IsIncognitoProfile() to return true for CEF profiles because, among other things, that causes the BrowserView to apply the dark toolbar theme. Instead, this change updates ProfileMenu expectations to support the CEF incognito profiles without otherwise modifying the incognito behavior. Note that the IsIncognitoProfile() implementation has recently changed in https://crrev.com/7bf6eb2497 and the conclusions in this commit will likely need to be revisited in an upcoming Chromium update.
2021-04-11 21:48:07 +02:00
diff --git chrome/browser/profiles/profile_window.cc chrome/browser/profiles/profile_window.cc
Update to Chromium version 99.0.4844.0 (#961656)
2022-01-25 21:26:51 +01:00
index 9e15e9ba100cd..d4388c060a18f 100644
chrome: Fix assertion when clicking the incognito profile button (see issue #2969) Profile::IsIncognitoProfile() currently returns false for CEF incognito profiles because they are not the primary OTR profile. At the same time, we don't necessarily want IsIncognitoProfile() to return true for CEF profiles because, among other things, that causes the BrowserView to apply the dark toolbar theme. Instead, this change updates ProfileMenu expectations to support the CEF incognito profiles without otherwise modifying the incognito behavior. Note that the IsIncognitoProfile() implementation has recently changed in https://crrev.com/7bf6eb2497 and the conclusions in this commit will likely need to be revisited in an upcoming Chromium update.
2021-04-11 21:48:07 +02:00
--- chrome/browser/profiles/profile_window.cc
+++ chrome/browser/profiles/profile_window.cc
Update to Chromium version 99.0.4844.0 (#961656)
2022-01-25 21:26:51 +01:00
@@ -280,7 +280,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
chrome: Fix assertion when clicking the incognito profile button (see issue #2969) Profile::IsIncognitoProfile() currently returns false for CEF incognito profiles because they are not the primary OTR profile. At the same time, we don't necessarily want IsIncognitoProfile() to return true for CEF profiles because, among other things, that causes the BrowserView to apply the dark toolbar theme. Instead, this change updates ProfileMenu expectations to support the CEF incognito profiles without otherwise modifying the incognito behavior. Note that the IsIncognitoProfile() implementation has recently changed in https://crrev.com/7bf6eb2497 and the conclusions in this commit will likely need to be revisited in an upcoming Chromium update.
2021-04-11 21:48:07 +02:00
*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;
}
chrome: Fix assertions when showing the incognito data dialog This dialog is displayed by (for example) pressing ctrl+h to open the history page while in incognito mode.
2022-03-22 17:21:34 +01:00
diff --git chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
index 142a9b12a734f..2055d03def80c 100644
--- chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
+++ chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
@@ -28,6 +28,9 @@ IncognitoClearBrowsingDataDialog* g_incognito_cbd_dialog = nullptr;
void IncognitoClearBrowsingDataDialog::Show(views::View* anchor_view,
Profile* incognito_profile,
Type type) {
+ // The full toolbar may not be visible.
+ if (!anchor_view)
+ return;
g_incognito_cbd_dialog = new IncognitoClearBrowsingDataDialog(
anchor_view, incognito_profile, type);
views::Widget* const widget =
@@ -69,7 +72,9 @@ IncognitoClearBrowsingDataDialog::IncognitoClearBrowsingDataDialog(
: BubbleDialogDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
incognito_profile_(incognito_profile) {
DCHECK(incognito_profile_);
- DCHECK(incognito_profile_->IsIncognitoProfile());
+ DCHECK(incognito_profile_->IsIncognitoProfile() ||
+ (incognito_profile_->IsOffTheRecord() &&
+ incognito_profile_->GetOTRProfileID().IsUniqueForCEF()));
SetButtons(ui::DIALOG_BUTTON_NONE);
SetShowCloseButton(true);
chrome: Fix assertion when clicking the incognito profile button (see issue #2969) Profile::IsIncognitoProfile() currently returns false for CEF incognito profiles because they are not the primary OTR profile. At the same time, we don't necessarily want IsIncognitoProfile() to return true for CEF profiles because, among other things, that causes the BrowserView to apply the dark toolbar theme. Instead, this change updates ProfileMenu expectations to support the CEF incognito profiles without otherwise modifying the incognito behavior. Note that the IsIncognitoProfile() implementation has recently changed in https://crrev.com/7bf6eb2497 and the conclusions in this commit will likely need to be revisited in an upcoming Chromium update.
2021-04-11 21:48:07 +02:00
diff --git chrome/browser/ui/views/profiles/incognito_menu_view.cc chrome/browser/ui/views/profiles/incognito_menu_view.cc
Update to Chromium version 99.0.4844.0 (#961656)
2022-01-25 21:26:51 +01:00
index 98617c979713b..1fac2a76ce097 100644
chrome: Fix assertion when clicking the incognito profile button (see issue #2969) Profile::IsIncognitoProfile() currently returns false for CEF incognito profiles because they are not the primary OTR profile. At the same time, we don't necessarily want IsIncognitoProfile() to return true for CEF profiles because, among other things, that causes the BrowserView to apply the dark toolbar theme. Instead, this change updates ProfileMenu expectations to support the CEF incognito profiles without otherwise modifying the incognito behavior. Note that the IsIncognitoProfile() implementation has recently changed in https://crrev.com/7bf6eb2497 and the conclusions in this commit will likely need to be revisited in an upcoming Chromium update.
2021-04-11 21:48:07 +02:00
--- chrome/browser/ui/views/profiles/incognito_menu_view.cc
+++ chrome/browser/ui/views/profiles/incognito_menu_view.cc
Update to Chromium version 98.0.4758.0 (#950365)
2021-12-16 23:35:54 +01:00
@@ -37,7 +37,9 @@
chrome: Fix assertion when clicking the incognito profile button (see issue #2969) Profile::IsIncognitoProfile() currently returns false for CEF incognito profiles because they are not the primary OTR profile. At the same time, we don't necessarily want IsIncognitoProfile() to return true for CEF profiles because, among other things, that causes the BrowserView to apply the dark toolbar theme. Instead, this change updates ProfileMenu expectations to support the CEF incognito profiles without otherwise modifying the incognito behavior. Note that the IsIncognitoProfile() implementation has recently changed in https://crrev.com/7bf6eb2497 and the conclusions in this commit will likely need to be revisited in an upcoming Chromium update.
2021-04-11 21:48:07 +02:00
IncognitoMenuView::IncognitoMenuView(views::Button* anchor_button,
Browser* browser)
: ProfileMenuViewBase(anchor_button, browser) {
- DCHECK(browser->profile()->IsIncognitoProfile());
+ DCHECK(browser->profile()->IsIncognitoProfile() ||
+ (browser->profile()->IsOffTheRecord() &&
+ browser->profile()->GetOTRProfileID().IsUniqueForCEF()));
GetViewAccessibility().OverrideName(GetAccessibleWindowTitle());
chrome::RecordDialogCreation(
diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
Update to Chromium version 100.0.4896.0 (#972766)
2022-02-21 23:23:40 +01:00
index 63d663a749c77..1c9376a64c623 100644
chrome: Fix assertion when clicking the incognito profile button (see issue #2969) Profile::IsIncognitoProfile() currently returns false for CEF incognito profiles because they are not the primary OTR profile. At the same time, we don't necessarily want IsIncognitoProfile() to return true for CEF profiles because, among other things, that causes the BrowserView to apply the dark toolbar theme. Instead, this change updates ProfileMenu expectations to support the CEF incognito profiles without otherwise modifying the incognito behavior. Note that the IsIncognitoProfile() implementation has recently changed in https://crrev.com/7bf6eb2497 and the conclusions in this commit will likely need to be revisited in an upcoming Chromium update.
2021-04-11 21:48:07 +02:00
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
Update to Chromium version 100.0.4896.0 (#972766)
2022-02-21 23:23:40 +01:00
@@ -512,7 +512,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode,
chrome: Fix assertion when clicking the incognito profile button (see issue #2969) Profile::IsIncognitoProfile() currently returns false for CEF incognito profiles because they are not the primary OTR profile. At the same time, we don't necessarily want IsIncognitoProfile() to return true for CEF profiles because, among other things, that causes the BrowserView to apply the dark toolbar theme. Instead, this change updates ProfileMenu expectations to support the CEF incognito profiles without otherwise modifying the incognito behavior. Note that the IsIncognitoProfile() implementation has recently changed in https://crrev.com/7bf6eb2497 and the conclusions in this commit will likely need to be revisited in an upcoming Chromium update.
2021-04-11 21:48:07 +02:00
Update to Chromium version 92.0.4515.0 (#885287)
2021-06-04 03:34:56 +02:00
ProfileMenuViewBase* bubble = nullptr;
chrome: Fix assertion when clicking the incognito profile button (see issue #2969) Profile::IsIncognitoProfile() currently returns false for CEF incognito profiles because they are not the primary OTR profile. At the same time, we don't necessarily want IsIncognitoProfile() to return true for CEF profiles because, among other things, that causes the BrowserView to apply the dark toolbar theme. Instead, this change updates ProfileMenu expectations to support the CEF incognito profiles without otherwise modifying the incognito behavior. Note that the IsIncognitoProfile() implementation has recently changed in https://crrev.com/7bf6eb2497 and the conclusions in this commit will likely need to be revisited in an upcoming Chromium update.
2021-04-11 21:48:07 +02:00
if (view_mode == profiles::BUBBLE_VIEW_MODE_INCOGNITO) {
- DCHECK(browser->profile()->IsIncognitoProfile());
+ DCHECK(browser->profile()->IsIncognitoProfile() ||
+ (browser->profile()->IsOffTheRecord() &&
+ browser->profile()->GetOTRProfileID().IsUniqueForCEF()));
bubble = new IncognitoMenuView(anchor_button, browser);
} else {
Update to Chromium version 96.0.4664.0 (#929512)
2021-10-19 00:17:16 +02:00
#if BUILDFLAG(IS_CHROMEOS_ASH)