MacViews: Harmony for toolbar actions bubbles.

chrome/browser/ui/cocoa/extensions/browser_actions_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 "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h"
+#import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_views_presenter.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/extensions/extension_message_bubble_bridge.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
 #include "chrome/grit/theme_resources.h"
@@ skipping 103 matching lines @@
 // Handles clicks for BrowserActionButtons.
 - (BOOL)browserActionClicked:(BrowserActionButton*)button;
 
 // Returns the associated ToolbarController.
 - (ToolbarController*)toolbarController;
 
 // Creates a message bubble with the given |delegate|.
 - (void)createMessageBubble:
     (std::unique_ptr<ToolbarActionsBarBubbleDelegate>)delegate;
 
-// Called when the window for the active bubble is closing, and sets the active
-// bubble to nil.
-- (void)bubbleWindowClosing:(NSNotification*)notification;
-
 // Sets the current focused view. Should only be used for the overflow
 // container.
 - (void)setFocusedViewIndex:(NSInteger)index;
 
 @end
 
 namespace {
 
 // A bridge between the ToolbarActionsBar and the BrowserActionsController.
 class ToolbarActionsBarBridge : public ToolbarActionsBarDelegate {
@@ skipping 105 matching lines @@
     browser_ = browser;
     isOverflow_ = mainController != nil;
 
     toolbarActionsBarBridge_.reset(new ToolbarActionsBarBridge(self));
     ToolbarActionsBar* mainBar =
         mainController ? [mainController toolbarActionsBar] : nullptr;
     toolbarActionsBar_.reset(
         new ToolbarActionsBar(toolbarActionsBarBridge_.get(),
                               browser_,
                               mainBar));
+    if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+      viewsBubblePresenter_ =
+          base::MakeUnique<ToolbarActionsBarBubbleViewsPresenter>(self);
+    }
 
     containerView_ = container;
     [containerView_ setMinWidth:toolbarActionsBar_->GetMinimumWidth()];
     [containerView_ setPostsFrameChangedNotifications:YES];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(containerFrameChanged:)
                name:NSViewFrameDidChangeNotification
              object:containerView_];
     [[NSNotificationCenter defaultCenter]
@@ skipping 112 matching lines @@
         [buttons_ count] - toolbarActionsBar_->GetIconCount() : -1;
     [self setFocusedViewIndex:index];
   }
 }
 
 - (gfx::Size)sizeForOverflowWidth:(int)maxWidth {
   toolbarActionsBar_->SetOverflowRowWidth(maxWidth);
   return [self preferredSize];
 }
 
+- (void)bubbleWindowClosing:(NSNotification*)notification {
+  activeBubble_ = nil;
+  toolbarActionsBar_->OnBubbleClosed();
+}
+
 - (void)updateMaxWidth {
   const CGFloat ownMaxWidth = toolbarActionsBar_->GetMaximumWidth();
   containerView_.maxWidth =
       (maxWidth_ ? std::min(maxWidth_, ownMaxWidth) : ownMaxWidth);
 }
 
 - (void)setMaxWidth:(CGFloat)maxWidth {
   maxWidth_ = maxWidth;
   [self updateMaxWidth];
 }
@@ skipping 307 matching lines @@
   // We need to flip the y coordinate for Cocoa's view system.
   frame.origin.y = NSHeight([containerView_ frame]) - NSMaxY(frame);
   if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout())
     frame.origin.x =
         NSWidth([containerView_ frame]) - NSWidth(frame) - NSMinX(frame);
   return frame;
 }
 
 - (NSPoint)popupPointForView:(NSView*)view
                   withBounds:(NSRect)bounds {
-  // Anchor point just above the center of the bottom.
-  int y = [view isFlipped] ? NSMaxY(bounds) - kBrowserActionBubbleYOffset :
-                             kBrowserActionBubbleYOffset;
-  NSPoint anchor = NSMakePoint(NSMidX(bounds), y);
+  NSPoint anchor;
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+    // Anchor to the bottom-right of the button.
+    anchor = NSMakePoint(NSMaxX(bounds), [view isFlipped] ? NSMaxY(bounds) : 0);
+  } else {
+    // Anchor point just above the center of the bottom.
+    int y = [view isFlipped] ? NSMaxY(bounds) - kBrowserActionBubbleYOffset
+                             : kBrowserActionBubbleYOffset;
+    anchor = NSMakePoint(NSMidX(bounds), y);
+  }
   // Convert the point to the container view's frame, and adjust for animation.
   NSPoint anchorInContainer =
       [containerView_ convertPoint:anchor fromView:view];
   anchorInContainer.x -= NSMinX([containerView_ frame]) -
       NSMinX([containerView_ animationEndFrame]);
 
   return [containerView_ convertPoint:anchorInContainer toView:nil];
 }
 
 - (void)moveButton:(BrowserActionButton*)button
@@ skipping 52 matching lines @@
       anchorView = [[self toolbarController] appMenuButton];
     }
   } else {
     anchorView = containerView_;
   }
 
   DCHECK_GE([buttons_ count], 0u);
   NSPoint anchor = [self popupPointForView:anchorView
                                 withBounds:[anchorView bounds]];
 
-  anchor = ui::ConvertPointFromWindowToScreen([containerView_ window], anchor);
+  NSWindow* parentWindow = [containerView_ window];
+  anchor = ui::ConvertPointFromWindowToScreen(parentWindow, anchor);
+  if (viewsBubblePresenter_) {
+    viewsBubblePresenter_->PresentAt(std::move(delegate), parentWindow, anchor,
+                                     anchoredToAction);
+    // No need to set |activeBubble_| as it's only used for Cocoa tests.

[Devlin, 2017/03/09 02:49:48]

Maybe also comment that bubbleWindowClosing will be called by the presenter,
since we don't register for a notification of it anymore?

[tapted, 2017/03/09 10:24:15]

Done.

+    return;
+  }
+
   activeBubble_ = [[ToolbarActionsBarBubbleMac alloc]
       initWithParentWindow:[containerView_ window]
                anchorPoint:anchor
           anchoredToAction:anchoredToAction
                   delegate:std::move(delegate)];
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(bubbleWindowClosing:)
              name:NSWindowWillCloseNotification
            object:[activeBubble_ window]];
   [activeBubble_ showWindow:nil];
 }
 
-- (void)bubbleWindowClosing:(NSNotification*)notification {
-  activeBubble_ = nil;
-  toolbarActionsBar_->OnBubbleClosed();
-}
-
 - (void)setFocusedViewIndex:(NSInteger)index {
   DCHECK(isOverflow_);
   focusedViewIndex_ = index;
 }
 
 #pragma mark -
 #pragma mark Testing Methods
 
 - (BrowserActionButton*)buttonWithIndex:(NSUInteger)index {
   return index < [buttons_ count] ? [buttons_ objectAtIndex:index] : nil;
 }
 
 @end