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
3.9 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 116.0.5845.0 (#1160321)
2023-06-26 12:13:38 +02:00
index 7ae18c5a960b0..d48ba838efe6f 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 130.0.6723.0 (#1356013)
2024-09-27 16:15:44 +02:00
index 3ac5ebf1b49b5..d41cffecb5603 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 130.0.6723.0 (#1356013)
2024-09-27 16:15:44 +02:00
@@ -32,7 +32,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()));
Update to Chromium version 130.0.6723.0 (#1356013)
2024-09-27 16:15:44 +02:00
SetButtons(static_cast<int>(ui::mojom::DialogButton::kNone));
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
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 124.0.6367.0 (#1274542)
2024-03-19 22:11:42 +01:00
index 791ab794c8750..ca9e0851e2689 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()));
Update to Chromium version 124.0.6367.0 (#1274542)
2024-03-19 22:11:42 +01:00
GetViewAccessibility().SetName(GetAccessibleWindowTitle(),
ax::mojom::NameFrom::kAttribute);
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
diff --git chrome/browser/ui/views/profiles/profile_menu_coordinator.cc chrome/browser/ui/views/profiles/profile_menu_coordinator.cc
Update to Chromium version 131.0.6768.0 (#1366576) mac: Switch to Xcode 16.0 16A242d with macOS SDK 15.0 24A336
2024-10-24 17:05:31 +02:00
index ee9f399e4c010..2182e42981f9d 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 131.0.6768.0 (#1366576) mac: Switch to Xcode 16.0 16A242d with macOS SDK 15.0 24A336
2024-10-24 17:05:31 +02:00
@@ -58,7 +58,9 @@ void ProfileMenuCoordinator::Show(bool is_source_accelerator) {
Update to Chromium version 118.0.5993.0 (#1192594)
2023-09-15 21:51:43 +02:00
is_incognito &= !browser.profile()->IsGuestSession();
#endif
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 118.0.5993.0 (#1192594)
2023-09-15 21:51:43 +02:00
- if (is_incognito) {
+ if (is_incognito ||
Update to Chromium version 106.0.5249.0 (#1036826)
2022-08-23 03:37:40 +02:00
+ (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 {