Mac Changes for BubbleManager

chrome/browser/ui/cocoa/browser_window_controller_private.mm

Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index 4d02ca5a9d775444404b2ad90fb15fccdfb5749f..a82c03f4e431f34f8a39dd1a7ec8f4d372b1fec0 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -22,6 +22,8 @@
 #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"
@@ -232,9 +234,11 @@ willPositionSheet:(NSWindow*)sheet
 
   // 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);

[groby-ooo-7-16, 2015/08/14 18:26:04]

Ideally, I'd like a way to do this platform-neutral. Can we move that
functionality on the Bubble(controller)?

+  }
 }
 
 - (void)applyTabStripLayout:(const chrome::TabStripLayout&)layout {
@@ -396,10 +400,8 @@ willPositionSheet:(NSWindow*)sheet
   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]];
@@ -446,6 +448,8 @@ willPositionSheet:(NSWindow*)sheet
   BOOL showDropdown =
       !fullscreen_for_tab && !kiosk_mode && ([self floatingBarHasFocus]);
 
+  /*
+   * TODO(hcarmona): bring this back

[groby-ooo-7-16, 2015/08/14 18:26:04]

Well, that's kind of a huge part of the cocoa side :)

Also, ideally, that's handled in the bubble manager for all bubbles that survive
fullscreen mode.

[hcarmona, 2015/08/18 02:22:21]

Yes, it's a big part. How should we handle this? Currently, the bubble's
native view is exposed to this code. I'm not a big fan of that because
it's exposing implementation details about bubbles for this. I also
would like to avoid adding code to the bubble API that's just for cocoa,
but that may be unavoidable.

   PermissionBubbleManager* manager = [self permissionBubbleManager];
   if (manager && manager->IsBubbleVisible()) {
     NSWindow* bubbleWindow = manager->GetBubbleWindow();
@@ -462,6 +466,7 @@ willPositionSheet:(NSWindow*)sheet
                    name:NSWindowWillCloseNotification
                  object:bubbleWindow];
   }
+  */
 
   if (showDropdown) {
     // Turn on layered mode for the window's root view for the entry
@@ -1118,10 +1123,4 @@ willPositionSheet:(NSWindow*)sheet
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
-- (PermissionBubbleManager*)permissionBubbleManager {
-  if (WebContents* contents = [self webContents])
-    return PermissionBubbleManager::FromWebContents(contents);
-  return nil;
-}
-
 @end  // @implementation BrowserWindowController(Private)