Refactor away the Browser* dependency in exclusive_access

chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
-#import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
+#import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h"
+#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/browser/extension_registry.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
 #include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/accelerators/platform_accelerator_cocoa.h"
 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
@@ skipping 28 matching lines @@
 // Returns a string representation fit for display of
 // +acceleratorForToggleFullscreen.
 + (NSString*)keyCommandString;
 
 + (NSString*)keyCombinationForAccelerator:
         (const ui::PlatformAcceleratorCocoa&)item;
 @end
 
 @implementation ExclusiveAccessBubbleWindowController
 
-- (id)initWithOwner:(BrowserWindowController*)owner
-            browser:(Browser*)browser
-                url:(const GURL&)url
-         bubbleType:(ExclusiveAccessBubbleType)bubbleType {
+- (id)initWithOwner:(NSWindowController*)owner
+    exclusive_access_manager:(ExclusiveAccessManager*)exclusive_access_manager
+                     profile:(Profile*)profile
+                         url:(const GURL&)url
+                  bubbleType:(ExclusiveAccessBubbleType)bubbleType {
   NSString* nibPath =
       [base::mac::FrameworkBundle() pathForResource:@"ExclusiveAccessBubble"
                                              ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibPath owner:self])) {
-    browser_ = browser;
+    exclusive_access_manager_ = exclusive_access_manager;
+    profile_ = profile;
     owner_ = owner;
     url_ = url;
     bubbleType_ = bubbleType;
     // Mouse lock expects mouse events to reach the main window immediately.
     // Make the bubble transparent for mouse events if mouse lock is enabled.
     if (bubbleType_ ==
             EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION ||
         bubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION)
       [[self window] setIgnoresMouseEvents:YES];
   }
   return self;
 }
 
 - (void)allow:(id)sender {
   // The mouselock code expects that mouse events reach the main window
   // immediately, but the cursor is still over the bubble, which eats the
   // mouse events. Make the bubble transparent for mouse events.
   if (bubbleType_ ==
           EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_BUTTONS ||
       bubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_BUTTONS)
     [[self window] setIgnoresMouseEvents:YES];
 
   DCHECK(exclusive_access_bubble::ShowButtonsForType(bubbleType_));
-  browser_->exclusive_access_manager()->OnAcceptExclusiveAccessPermission();
+  exclusive_access_manager_->OnAcceptExclusiveAccessPermission();
 }
 
 - (void)deny:(id)sender {
   DCHECK(exclusive_access_bubble::ShowButtonsForType(bubbleType_));
-  browser_->exclusive_access_manager()->OnDenyExclusiveAccessPermission();
+  exclusive_access_manager_->OnDenyExclusiveAccessPermission();
 }
 
 - (void)showButtons:(BOOL)show {
   [allowButton_ setHidden:!show];
   [denyButton_ setHidden:!show];
   [exitLabel_ setHidden:show];
 }
 
 // We want this to be a child of a browser window.  addChildWindow:
 // (called from this function) will bring the window on-screen;
 // unfortunately, [NSWindowController showWindow:] will also bring it
 // on-screen (but will cause unexpected changes to the window's
 // position).  We cannot have an addChildWindow: and a subsequent
 // showWindow:. Thus, we have our own version.
 - (void)showWindow {
   // Completes nib load.
   InfoBubbleWindow* info_bubble = static_cast<InfoBubbleWindow*>([self window]);
   [info_bubble setCanBecomeKeyWindow:NO];
   if (!exclusive_access_bubble::ShowButtonsForType(bubbleType_)) {
     [self hideSoon];
   }
   [tweaker_ tweakUI:info_bubble];
   [[owner_ window] addChildWindow:info_bubble ordered:NSWindowAbove];
-  [owner_ layoutSubviews];
+
+  if ([owner_ respondsToSelector:@selector(layoutSubviews)])
+    [(id)owner_ layoutSubviews];
 
   [info_bubble orderFront:self];
 }
 
 - (void)awakeFromNib {
   DCHECK([[self window] isKindOfClass:[InfoBubbleWindow class]]);
   [messageLabel_ setStringValue:[self getLabelText]];
   [self initializeLabelAndButton];
 }
 
 - (void)positionInWindowAtTop:(CGFloat)maxY width:(CGFloat)maxWidth {
   NSRect windowFrame = [self window].frame;
   NSRect ownerWindowFrame = [owner_ window].frame;
   NSPoint origin;
   origin.x = ownerWindowFrame.origin.x +
              (int)(NSWidth(ownerWindowFrame) / 2 - NSWidth(windowFrame) / 2);
   origin.y = ownerWindowFrame.origin.y + maxY - NSHeight(windowFrame);
   [[self window] setFrameOrigin:origin];
 }
 
 // Called when someone clicks on the embedded link.
 - (BOOL)textView:(NSTextView*)textView
     clickedOnLink:(id)link
           atIndex:(NSUInteger)charIndex {
-  browser_->exclusive_access_manager()
-      ->fullscreen_controller()
+  exclusive_access_manager_->fullscreen_controller()
       ->ExitExclusiveAccessToPreviousState();
   return YES;
 }
 
 - (void)hideTimerFired:(NSTimer*)timer {
   // This might fire racily for buttoned bubbles, even though the timer is
   // cancelled for them. Explicitly check for this case.
   if (exclusive_access_bubble::ShowButtonsForType(bubbleType_))
     return;
 
@@ skipping 108 matching lines @@
     [allowButton_ setTitle:allowButtonText];
   } else {
     [self showButtons:NO];
   }
 }
 
 - (NSString*)getLabelText {
   if (bubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE)
     return @"";
   extensions::ExtensionRegistry* registry =
-      extensions::ExtensionRegistry::Get(browser_->profile());
+      extensions::ExtensionRegistry::Get(profile_);
   return SysUTF16ToNSString(exclusive_access_bubble::GetLabelTextForType(
       bubbleType_, url_, registry));
 }
 
 // This looks at the Main Menu and determines what the user has set as the
 // key combination for quit. It then gets the modifiers and builds an object
 // to hold the data.
 + (scoped_ptr<ui::PlatformAcceleratorCocoa>)acceleratorForToggleFullscreen {
   NSMenu* mainMenu = [NSApp mainMenu];
   // Get the application menu (i.e. Chromium).
@@ skipping 45 matching lines @@
 - (void)hideSoon {
   hideTimer_.reset(
       [[NSTimer scheduledTimerWithTimeInterval:kInitialDelay
                                         target:self
                                       selector:@selector(hideTimerFired:)
                                       userInfo:nil
                                        repeats:NO] retain]);
 }
 
 @end