Index: chrome/browser/ui/cocoa/browser_window_controller.h |
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h |
index 551599abc709adf288d255a38e508501137180af..7eb71f96e67c859442ac06b2fb2825f9c7ccf4f5 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_controller.h |
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h |
@@ -18,12 +18,12 @@ |
#include "chrome/browser/ui/tabs/tab_utils.h" |
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" |
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" |
-#import "chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h" |
#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" |
#import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h" |
#import "chrome/browser/ui/cocoa/themed_window.h" |
#import "chrome/browser/ui/cocoa/url_drop_target.h" |
#import "chrome/browser/ui/cocoa/view_resizer.h" |
+#include "chrome/browser/ui/views/exclusive_access_bubble_views.h" |
#include "components/translate/core/common/translate_errors.h" |
#include "ui/base/accelerators/accelerator_manager.h" |
#include "ui/gfx/geometry/rect.h" |
@@ -81,8 +81,7 @@ class Command; |
base::scoped_nsobject<OverlayableContentsController> |
overlayableContentsController_; |
base::scoped_nsobject<PresentationModeController> presentationModeController_; |
- base::scoped_nsobject<ExclusiveAccessBubbleWindowController> |
- exclusiveAccessBubbleWindowController_; |
+ scoped_ptr<ExclusiveAccessBubbleViews> exclusive_access_bubble_; |
base::scoped_nsobject<BrowserWindowFullscreenTransition> |
fullscreenTransition_; |
@@ -631,9 +630,6 @@ class Command; |
- (NSSize)overflowFrom:(NSRect)source |
to:(NSRect)target; |
-// The fullscreen exit bubble controller, or nil if the bubble isn't showing. |
-- (ExclusiveAccessBubbleWindowController*)exclusiveAccessBubbleWindowController; |
- |
// Gets the rect, in window base coordinates, that the omnibox popup should be |
// positioned relative to. |
- (NSRect)omniboxPopupAnchorRect; |