Mac Changes for BubbleManager

chrome/browser/ui/cocoa/browser_window_controller_private.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 "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window_state.h"
+#include "chrome/browser/ui/chrome_bubble_manager.h"
+#include "chrome/browser/ui/chrome_bubble_manager_factory.h"
 #import "chrome/browser/ui/cocoa/browser_window_enter_fullscreen_transition.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/custom_frame_view.h"
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
@@ skipping 190 matching lines @@
 
   base::scoped_nsobject<BrowserWindowLayout> layout(
       [[BrowserWindowLayout alloc] init]);
   [self updateLayoutParameters:layout];
   [self applyLayout:layout];
 
   [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]];
 
   // Will update the location of the permission bubble when showing/hiding the
   // top level toolbar in fullscreen.
-  PermissionBubbleManager* manager = [self permissionBubbleManager];
-  if (manager)
-    manager->UpdateAnchorPosition();
+  WebContents* contents = [self webContents];
+  if (contents) {
+    ChromeBubbleManagerFactory::GetForBrowserContext(browser_->profile())
+        ->UpdateAnchorPosition(contents);
+  }
 }
 
 - (void)applyTabStripLayout:(const chrome::TabStripLayout&)layout {
   // Update the presence of the window controls.
   if (layout.addCustomWindowControls)
     [tabStripController_ addCustomWindowControls];
   else
     [tabStripController_ removeCustomWindowControls];
 
   // Update the layout of the avatar.
@@ skipping 141 matching lines @@
     [[destWindow contentView] addSubview:tabStripView];
 
   [sourceWindow setWindowController:nil];
   [self setWindow:destWindow];
   [destWindow setWindowController:self];
 
   // Move the status bubble over, if we have one.
   if (statusBubble_)
     statusBubble_->SwitchParentWindow(destWindow);
 
-  // Updates the bubble position.
-  PermissionBubbleManager* manager = [self permissionBubbleManager];
-  if (manager)
-    manager->UpdateAnchorPosition();
+  ChromeBubbleManagerFactory::GetForBrowserContext(browser_->profile())
+      ->FullscreenToggle([self webContents]);
 
   // Move the title over.
   [destWindow setTitle:[sourceWindow title]];
 
   // The window needs to be onscreen before we can set its first responder.
   // Ordering the window to the front can change the active Space (either to
   // the window's old Space or to the application's assigned Space). To prevent
   // this by temporarily change the collectionBehavior.
   NSWindowCollectionBehavior behavior = [sourceWindow collectionBehavior];
   [destWindow setCollectionBehavior:
@@ skipping 26 matching lines @@
 
 - (void)configurePresentationModeController {
   BOOL fullscreen_for_tab = browser_->exclusive_access_manager()
                                 ->fullscreen_controller()
                                 ->IsWindowFullscreenForTabOrPending();
   BOOL kiosk_mode =
       base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
   BOOL showDropdown =
       !fullscreen_for_tab && !kiosk_mode && ([self floatingBarHasFocus]);
 
+  /*
+   * TODO(hcarmona): This code needs to know about the bubble window...
+   * This is very specific to bubbles that survive fullscreen transition that
+   * also have an anchor on the location bar. Not sure if this should be handled
+   * by the bubble manager or if the bubble manager should expose the bubble
+   * window to its callers for mac. Ideas?
+   *
   PermissionBubbleManager* manager = [self permissionBubbleManager];
   if (manager && manager->IsBubbleVisible()) {
     NSWindow* bubbleWindow = manager->GetBubbleWindow();
     DCHECK(bubbleWindow);
     // A visible permission bubble will force the dropdown to remain
     // visible.
     [self lockBarVisibilityForOwner:bubbleWindow withAnimation:NO delay:NO];
     showDropdown = YES;
     // Register to be notified when the permission bubble is closed, to
     // allow fullscreen to hide the dropdown.
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
                selector:@selector(permissionBubbleWindowWillClose:)
                    name:NSWindowWillCloseNotification
                  object:bubbleWindow];
   }
+  */
 
   if (showDropdown) {
     // Turn on layered mode for the window's root view for the entry
     // animation.  Without this, the OS fullscreen animation for entering
     // fullscreen mode does not correctly draw the tab strip.
     // It will be turned off (set back to NO) when the animation finishes,
     // in -windowDidEnterFullScreen:.
     // Leaving wantsLayer on for the duration of presentation mode causes
     // performance issues when the dropdown is animated in/out.  It also does
     // not seem to be required for the exit animation.
@@ skipping 636 matching lines @@
   if ([enterFullscreenTransition_ shouldWindowBeUnconstrained])
     return NO;
 
   return [super shouldConstrainFrameRect];
 }
 
 - (WebContents*)webContents {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
-- (PermissionBubbleManager*)permissionBubbleManager {
-  if (WebContents* contents = [self webContents])
-    return PermissionBubbleManager::FromWebContents(contents);
-  return nil;
-}
-
 @end  // @implementation BrowserWindowController(Private)