[Extension Toolbar] Slide out overflowed actions for popups

chrome/browser/ui/cocoa/extensions/browser_action_button.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_action_button.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
@@ skipping 78 matching lines @@
   // We should only be showing the context menu in this way if we're doing so
   // for an overflowed action.
   DCHECK(![owner_ superview]);
 
   WrenchMenuController* wrenchMenuController =
       [[[BrowserWindowController browserWindowControllerForWindow:
           [controller_ browser]->window()->GetNativeWindow()]
               toolbarController] wrenchMenuController];
   // If the wrench menu is open, we have to first close it. Part of this happens
   // asynchronously, so we have to use a posted task to open the next menu.
-  if ([wrenchMenuController isMenuOpen]) {
+  if ([wrenchMenuController isMenuOpen])
     [wrenchMenuController cancel];
-    base::MessageLoop::current()->PostTask(
-        FROM_HERE,
-        base::Bind(&ToolbarActionViewDelegateBridge::DoShowContextMenu,
-                   weakFactory_.GetWeakPtr()));
-  } else {
-    DoShowContextMenu();
-  }
+  [controller_ toolbarActionsBar]->PopOutAction(
+      viewController_,
+      base::Bind(&ToolbarActionViewDelegateBridge::DoShowContextMenu,
+                 weakFactory_.GetWeakPtr()));
 }
 
 content::WebContents* ToolbarActionViewDelegateBridge::GetCurrentWebContents()
     const {
   return [controller_ currentWebContents];
 }
 
 void ToolbarActionViewDelegateBridge::UpdateState() {
   [owner_ updateState];
 }
 
 void ToolbarActionViewDelegateBridge::OnPopupShown(bool by_user) {
   if (by_user)
     user_shown_popup_visible_ = true;
   [owner_ updateHighlightedState];
 }
 
 void ToolbarActionViewDelegateBridge::OnPopupClosed() {
   user_shown_popup_visible_ = false;
   [owner_ updateHighlightedState];
 }
 
 void ToolbarActionViewDelegateBridge::DoShowContextMenu() {
-  NSButton* wrenchButton =
-      [[[BrowserWindowController browserWindowControllerForWindow:
-          [controller_ browser]->window()->GetNativeWindow()]
-              toolbarController] wrenchButton];
   // The point the menu shows matches that of the normal wrench menu - that is,
   // the right-left most corner of the menu is left-aligned with the wrench
   // button, and the menu is displayed "a little bit" lower. It would be nice to
   // be able to avoid the magic '5' here, but since it's built into Cocoa, it's
   // not too hopeful.
-  NSPoint menuPoint = NSMakePoint(0, NSHeight([wrenchButton bounds]) + 5);
-
-  // We set the wrench to be highlighted so it remains "pressed" when the menu
-  // is running.
-  [[wrenchButton cell] setHighlighted:YES];
+  NSPoint menuPoint = NSMakePoint(0, NSHeight([owner_ bounds]) + 5);
+  [[owner_ cell] setHighlighted:YES];
   [[owner_ menu] popUpMenuPositioningItem:nil
                                atLocation:menuPoint
-                                   inView:wrenchButton];
-  [[wrenchButton cell] setHighlighted:NO];
+                                   inView:owner_];
+  [[owner_ cell] setHighlighted:NO];
+  [controller_ toolbarActionsBar]->PopInAction();
 }
 
 @interface BrowserActionCell (Internals)
 - (void)drawBadgeWithinFrame:(NSRect)frame
               forWebContents:(content::WebContents*)webContents;
 @end
 
 @implementation BrowserActionButton
 
 @synthesize isBeingDragged = isBeingDragged_;
@@ skipping 171 matching lines @@
 }
 
 - (void)updateHighlightedState {
   // The button's cell is highlighted if either the popup is showing by a user
   // action, or the user is about to drag the button, unless the button is
   // overflowed (in which case it is never highlighted).
   if ([self superview] && ![browserActionsController_ isOverflow]) {
     BOOL highlighted = viewControllerDelegate_->user_shown_popup_visible() ||
         dragCouldStart_;
     [[self cell] setHighlighted:highlighted];
+  } else {
+    [[self cell] setHighlighted:NO];
   }
 }
 
 - (void)setFrame:(NSRect)frameRect animate:(BOOL)animate {
   if (!animate) {
     [self setFrame:frameRect];
   } else {
     if ([moveAnimation_ isAnimating])
       [moveAnimation_ stopAnimation];
 
@@ skipping 170 matching lines @@
 - (ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
   ui::ThemeProvider* themeProvider = [window themeProvider];
   if (!themeProvider)
     themeProvider =
         [[browserActionsController_ browser]->window()->GetNativeWindow()
             themeProvider];
   return themeProvider;
 }
 
 @end