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

Unified Diff: chrome/browser/profile_resetter/profile_reset_global_error.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
« no previous file with comments | « chrome/browser/profile_resetter/profile_reset_global_error.h ('k') | chrome/browser/ui/browser_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profile_resetter/profile_reset_global_error.cc
diff --git a/chrome/browser/profile_resetter/profile_reset_global_error.cc b/chrome/browser/profile_resetter/profile_reset_global_error.cc
index 4022800785688ab001f16be0b5cd1a4b6989c8c1..a355b6429c1ecd98579bd86803533bf3a619ebf3 100644
--- a/chrome/browser/profile_resetter/profile_reset_global_error.cc
+++ b/chrome/browser/profile_resetter/profile_reset_global_error.cc
@@ -10,10 +10,10 @@
#include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/browser/ui/global_error/global_error_service.h"
#include "chrome/browser/ui/global_error/global_error_service_factory.h"
-#include "chrome/browser/ui/profile_reset_bubble.h"
#include "chrome/common/url_constants.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
@@ -52,8 +52,8 @@ ProfileResetGlobalError::~ProfileResetGlobalError() {
}
// static
-bool ProfileResetGlobalError::IsSupportedOnPlatform() {
- return IsProfileResetBubbleSupported();
+bool ProfileResetGlobalError::IsSupportedOnPlatform(Browser* browser) {
+ return browser->window()->IsProfileResetBubbleSupported();
}
bool ProfileResetGlobalError::HasMenuItem() { return true; }
@@ -83,7 +83,7 @@ void ProfileResetGlobalError::ShowBubbleView(Browser* browser) {
return;
has_shown_bubble_view_ = true;
- bubble_view_ = ShowProfileResetBubble(AsWeakPtr(), browser);
+ bubble_view_ = browser->window()->ShowProfileResetBubble(AsWeakPtr());
if (automatic_profile_resetter_)
automatic_profile_resetter_->NotifyDidShowResetBubble();
« no previous file with comments | « chrome/browser/profile_resetter/profile_reset_global_error.h ('k') | chrome/browser/ui/browser_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698