Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(680)

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 841163002: MacViews: Fix duplicate ShowSessionCrashBubble and ShowProfileResetBubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keybinding
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 6e43d692bda91cf48dfea9b6ebcf22a6dee055f6..0f157c1438acf74c0b1c58115a5726094742a5cb 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -81,6 +81,8 @@
#include "chrome/browser/ui/views/profiles/avatar_menu_bubble_view.h"
#include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
#include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
+#include "chrome/browser/ui/views/profiles/profile_reset_bubble_view.h"
+#include "chrome/browser/ui/views/session_crashed_bubble_view.h"
#include "chrome/browser/ui/views/settings_api_bubble_helper_views.h"
#include "chrome/browser/ui/views/status_bubble_views.h"
#include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
@@ -1265,6 +1267,19 @@ void BrowserView::ShowTranslateBubble(
error_type, is_user_gesture);
}
+bool BrowserView::ShowSessionCrashedBubble() {
+ return SessionCrashedBubbleView::Show(browser_.get());
+}
+
+bool BrowserView::IsProfileResetBubbleSupported() const {
+ return true;
+}
+
+GlobalErrorBubbleViewBase* BrowserView::ShowProfileResetBubble(
+ const base::WeakPtr<ProfileResetGlobalError>& global_error) {
+ return ProfileResetBubbleView::ShowBubble(global_error, browser_.get());
+}
+
#if defined(ENABLE_ONE_CLICK_SIGNIN)
void BrowserView::ShowOneClickSigninBubble(
OneClickSigninBubbleType type,
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/profiles/profile_reset_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698