Mac Changes for BubbleManager

chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
index b740fc5c93aad7ed1d85521afe2da83c4cbe4bdb..d6911b66c2e09c6d92fccc0d034879a1a8163031 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
@@ -24,8 +24,8 @@
 #include "chrome/browser/ui/cocoa/website_settings/permission_selector_button.h"
 #include "chrome/browser/ui/cocoa/website_settings/split_block_button.h"
 #include "chrome/browser/ui/cocoa/website_settings/website_settings_utils_cocoa.h"
+#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
-#include "chrome/browser/ui/website_settings/permission_bubble_view.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/native_web_keyboard_event.h"
@@ -84,7 +84,7 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
 - (id)initForURL:(const GURL&)url
          allowed:(BOOL)allow
            index:(int)index
-        delegate:(PermissionBubbleView::Delegate*)delegate;
+         manager:(PermissionBubbleManager*)manager;
 
 // Returns the maximum width of its possible titles.
 - (CGFloat)maximumTitleWidth;
@@ -95,22 +95,21 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
 - (id)initForURL:(const GURL&)url
          allowed:(BOOL)allow
            index:(int)index
-        delegate:(PermissionBubbleView::Delegate*)delegate {
+         manager:(PermissionBubbleManager*)manager {
   if (self = [super initWithFrame:NSZeroRect pullsDown:NO]) {
     ContentSetting setting =
         allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
     [self setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
     [self setBordered:NO];
 
-    __block PermissionBubbleView::Delegate* blockDelegate = delegate;
+    __block PermissionBubbleManager* blockManager = manager;
     __block AllowBlockMenuButton* blockSelf = self;
     PermissionMenuModel::ChangeCallback changeCallback =
         base::BindBlock(^(const WebsiteSettingsUI::PermissionInfo& permission) {
-            blockDelegate->ToggleAccept(
-                index, permission.setting == CONTENT_SETTING_ALLOW);
-            [blockSelf setFrameSize:
-                SizeForWebsiteSettingsButtonTitle(blockSelf,
-                                                  [blockSelf title])];
+          blockManager->ToggleAccept(
+              index, permission.setting == CONTENT_SETTING_ALLOW);
+          [blockSelf setFrameSize:SizeForWebsiteSettingsButtonTitle(
+                                      blockSelf, [blockSelf title])];
         });
 
     menuModel_.reset(new PermissionMenuModel(url, setting, changeCallback));
@@ -272,12 +271,12 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
   [self setAnchorPoint:[self getExpectedAnchorPoint]];
 }
 
-- (void)showWithDelegate:(PermissionBubbleView::Delegate*)delegate
-             forRequests:(const std::vector<PermissionBubbleRequest*>&)requests
-            acceptStates:(const std::vector<bool>&)acceptStates {
+- (void)showWithManager:(PermissionBubbleManager*)manager
+            forRequests:(const std::vector<PermissionBubbleRequest*>&)requests
+           acceptStates:(const std::vector<bool>&)acceptStates {
   DCHECK(!requests.empty());
-  DCHECK(delegate);
-  delegate_ = delegate;
+  DCHECK(manager);
+  manager_ = manager;
 
   NSView* contentView = [[self window] contentView];
   [contentView setSubviews:@[]];
@@ -533,12 +532,12 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
                   atIndex:(int)index
                     allow:(BOOL)allow {
   DCHECK(request);
-  DCHECK(delegate_);
+  DCHECK(manager_);
   base::scoped_nsobject<AllowBlockMenuButton> button(
       [[AllowBlockMenuButton alloc] initForURL:request->GetRequestingHostname()
                                        allowed:allow
                                          index:index
-                                      delegate:delegate_]);
+                                       manager:manager_]);
   return button.autorelease();
 }
 
@@ -571,23 +570,23 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
 }
 
 - (void)ok:(id)sender {
-  DCHECK(delegate_);
-  delegate_->Accept();
+  DCHECK(manager_);
+  manager_->Accept();
 }
 
 - (void)onAllow:(id)sender {
-  DCHECK(delegate_);
-  delegate_->Accept();
+  DCHECK(manager_);
+  manager_->Accept();
 }
 
 - (void)onBlock:(id)sender {
-  DCHECK(delegate_);
-  delegate_->Deny();
+  DCHECK(manager_);
+  manager_->Deny();
 }
 
 - (void)onClose:(id)sender {
-  DCHECK(delegate_);
-  delegate_->Closing();
+  DCHECK(manager_);
+  manager_->Closing();
 }
 
 - (void)activateTabWithContents:(content::WebContents*)newContents