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...

76 lines
4.0 KiB
Diff
Raw Normal View History

Update to Chromium version 106.0.5249.0 (#1036826)
2022-08-23 03:37:40 +02:00
diff --git chrome/browser/ui/bookmarks/bookmark_stats.cc chrome/browser/ui/bookmarks/bookmark_stats.cc
Update to Chromium version 107.0.5304.0 (#1047731)
2022-09-26 21:30:45 +02:00
index 45f661faa6e0b..777a1f6c333b6 100644
Update to Chromium version 106.0.5249.0 (#1036826)
2022-08-23 03:37:40 +02:00
--- chrome/browser/ui/bookmarks/bookmark_stats.cc
+++ chrome/browser/ui/bookmarks/bookmark_stats.cc
@@ -21,7 +21,9 @@ bool IsBookmarkBarLocation(BookmarkLaunchLocation location) {
auto GetMetricProfile(const Profile* profile) {
DCHECK(profile);
- DCHECK(profile->IsRegularProfile() || profile->IsIncognitoProfile());
+ DCHECK(profile->IsRegularProfile() || profile->IsIncognitoProfile() ||
+ (profile->IsOffTheRecord() &&
+ profile->GetOTRProfileID().IsUniqueForCEF()));
return profile->IsRegularProfile()
? profile_metrics::BrowserProfileType::kRegular
: profile_metrics::BrowserProfileType::kIncognito;
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
Update to Chromium version 111.0.5563.0 (#1097615)
2023-01-30 18:43:54 +01:00
index f3a5093abe7ca..f2bcc7b3c1f4c 100644
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
--- chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
+++ chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc
Update to Chromium version 111.0.5563.0 (#1097615)
2023-01-30 18:43:54 +01:00
@@ -30,7 +30,9 @@ IncognitoClearBrowsingDataDialog::IncognitoClearBrowsingDataDialog(
Update to Chromium version 101.0.4951.0 (#982481) Known issues: - chrome: Some ceftests are failing due to bfcache same-site enabled by default (see issue #3301)
2022-03-26 02:12:30 +01:00
dialog_type_(type),
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
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);
Update to Chromium version 106.0.5249.0 (#1036826)
2022-08-23 03:37:40 +02:00
diff --git chrome/browser/ui/views/incognito_clear_browsing_data_dialog_coordinator.cc chrome/browser/ui/views/incognito_clear_browsing_data_dialog_coordinator.cc
Update to Chromium version 107.0.5304.0 (#1047731)
2022-09-26 21:30:45 +02:00
index caa20ec03434a..2a3ca921445c1 100644
Update to Chromium version 106.0.5249.0 (#1036826)
2022-08-23 03:37:40 +02:00
--- chrome/browser/ui/views/incognito_clear_browsing_data_dialog_coordinator.cc
+++ chrome/browser/ui/views/incognito_clear_browsing_data_dialog_coordinator.cc
@@ -26,6 +26,10 @@ void IncognitoClearBrowsingDataDialogCoordinator::Show(
->toolbar_button_provider()
->GetAvatarToolbarButton();
+ // The full toolbar may not be visible.
+ if (!avatar_toolbar_button)
+ return;
+
auto bubble = std::make_unique<IncognitoClearBrowsingDataDialog>(
avatar_toolbar_button, GetBrowser().profile(), type);
DCHECK_EQ(nullptr, bubble_tracker_.view());
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 112.0.5615.0 - Windows: VS2022 and Win11 SDK 10.0.22621.0 are now required.
2023-02-27 19:52:38 +01:00
index f5f266328283d..672609d94d1b7 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 112.0.5615.0 - Windows: VS2022 and Win11 SDK 10.0.22621.0 are now required.
2023-02-27 19:52:38 +01:00
@@ -36,7 +36,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());
Update to Chromium version 103.0.5060.0 (#1002911)
2022-05-19 12:28:44 +02:00
base::RecordAction(base::UserMetricsAction("IncognitoMenu_Show"));
Update to Chromium version 106.0.5249.0 (#1036826)
2022-08-23 03:37:40 +02:00
diff --git chrome/browser/ui/views/profiles/profile_menu_coordinator.cc chrome/browser/ui/views/profiles/profile_menu_coordinator.cc
Update to Chromium version 113.0.5672.0 (#1121455)
2023-04-04 20:00:13 +02:00
index a315cdc513f1d..036236798652c 100644
Update to Chromium version 106.0.5249.0 (#1036826)
2022-08-23 03:37:40 +02:00
--- chrome/browser/ui/views/profiles/profile_menu_coordinator.cc
+++ chrome/browser/ui/views/profiles/profile_menu_coordinator.cc
Update to Chromium version 111.0.5563.0 (#1097615)
2023-01-30 18:43:54 +01:00
@@ -45,7 +45,9 @@ void ProfileMenuCoordinator::Show(bool is_source_accelerator) {
Update to Chromium version 104.0.5112.0 (#1012729) - Mac: 10.13 is now the minimum required macOS version
2022-06-17 15:28:55 +02:00
feature_engagement::kIPHProfileSwitchFeature);
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 106.0.5249.0 (#1036826)
2022-08-23 03:37:40 +02:00
std::unique_ptr<ProfileMenuViewBase> bubble;
- if (browser.profile()->IsIncognitoProfile()) {
+ if (browser.profile()->IsIncognitoProfile() ||
+ (browser.profile()->IsOffTheRecord() &&
+ browser.profile()->GetOTRProfileID().IsUniqueForCEF())) {
bubble =
std::make_unique<IncognitoMenuView>(avatar_toolbar_button, &browser);
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
} else {