| diff --git chrome/browser/ui/bookmarks/bookmark_stats.cc chrome/browser/ui/bookmarks/bookmark_stats.cc |
| index 7ae18c5a960b0..d48ba838efe6f 100644 |
| --- 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; |
| diff --git chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc |
| index 9f1cb38d90303..986ac5ed9bdaf 100644 |
| --- chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc |
| +++ chrome/browser/ui/views/incognito_clear_browsing_data_dialog.cc |
| @@ -31,7 +31,9 @@ IncognitoClearBrowsingDataDialog::IncognitoClearBrowsingDataDialog( |
| dialog_type_(type), |
| 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); |
| |
| diff --git chrome/browser/ui/views/incognito_clear_browsing_data_dialog_coordinator.cc chrome/browser/ui/views/incognito_clear_browsing_data_dialog_coordinator.cc |
| index caa20ec03434a..2a3ca921445c1 100644 |
| --- 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()); |
| diff --git chrome/browser/ui/views/profiles/incognito_menu_view.cc chrome/browser/ui/views/profiles/incognito_menu_view.cc |
| index f5f266328283d..672609d94d1b7 100644 |
| --- chrome/browser/ui/views/profiles/incognito_menu_view.cc |
| +++ chrome/browser/ui/views/profiles/incognito_menu_view.cc |
| @@ -36,7 +36,9 @@ |
| 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()); |
| |
| base::RecordAction(base::UserMetricsAction("IncognitoMenu_Show")); |
| diff --git chrome/browser/ui/views/profiles/profile_menu_coordinator.cc chrome/browser/ui/views/profiles/profile_menu_coordinator.cc |
| index 521991e8e47ff..76f00e99336ee 100644 |
| --- chrome/browser/ui/views/profiles/profile_menu_coordinator.cc |
| +++ chrome/browser/ui/views/profiles/profile_menu_coordinator.cc |
| @@ -52,7 +52,9 @@ void ProfileMenuCoordinator::Show(bool is_source_accelerator) { |
| is_incognito &= !browser.profile()->IsGuestSession(); |
| #endif |
| |
| - if (is_incognito) { |
| + if (is_incognito || |
| + (browser.profile()->IsOffTheRecord() && |
| + browser.profile()->GetOTRProfileID().IsUniqueForCEF())) { |
| bubble = |
| std::make_unique<IncognitoMenuView>(avatar_toolbar_button, &browser); |
| } else { |