summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/cocoa')
-rw-r--r--chrome/browser/ui/cocoa/global_error_bubble_controller.h4
-rw-r--r--chrome/browser/ui/cocoa/global_error_bubble_controller.mm6
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.h b/chrome/browser/ui/cocoa/global_error_bubble_controller.h
index b2106e6..5d80a35 100644
--- a/chrome/browser/ui/cocoa/global_error_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.h
@@ -12,7 +12,7 @@
#import "chrome/browser/ui/cocoa/base_bubble_controller.h"
class Browser;
-class GlobalError;
+class GlobalErrorWithStandardBubble;
@class GTMUILocalizerAndLayoutTweaker;
@class GTMWidthBasedTweaker;
class Profile;
@@ -25,7 +25,7 @@ class Bridge;
// about a global error.
@interface GlobalErrorBubbleController : BaseBubbleController {
@private
- base::WeakPtr<GlobalError> error_;
+ base::WeakPtr<GlobalErrorWithStandardBubble> error_;
scoped_ptr<GlobalErrorBubbleControllerInternal::Bridge> bridge_;
Browser* browser_;
diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
index 4ccb41a..d053972 100644
--- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
@@ -55,7 +55,7 @@ class Bridge : public GlobalErrorBubbleViewBase {
@implementation GlobalErrorBubbleController
+ (GlobalErrorBubbleViewBase*)showForBrowser:(Browser*)browser
- error:(const base::WeakPtr<GlobalError>&)error {
+ error:(const base::WeakPtr<GlobalErrorWithStandardBubble>&)error {
NSWindow* parentWindow = browser->window()->GetNativeWindow();
BrowserWindowController* bwc = [BrowserWindowController
browserWindowControllerForWindow:parentWindow];
@@ -161,8 +161,8 @@ class Bridge : public GlobalErrorBubbleViewBase {
@end
-GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowBubbleView(
+GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowStandardBubbleView(
Browser* browser,
- const base::WeakPtr<GlobalError>& error) {
+ const base::WeakPtr<GlobalErrorWithStandardBubble>& error) {
return [GlobalErrorBubbleController showForBrowser:browser error:error];
}