[Extension Toolbar] Slide out overflowed actions for popups

chrome/browser/ui/cocoa/extensions/extension_popup_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/extension_popup_controller.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 10 matching lines @@
 #include "components/web_modal/popup_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/base/cocoa/window_size_constants.h"
 
 using content::BrowserContext;
 using content::RenderViewHost;
 using content::WebContents;
+using extensions::ExtensionViewHost;
 
 namespace {
 // The duration for any animations that might be invoked by this controller.
 const NSTimeInterval kAnimationDuration = 0.2;
 
 // There should only be one extension popup showing at one time. Keep a
 // reference to it here.
 static ExtensionPopupController* gPopup;
 
 // Given a value and a rage, clamp the value into the range.
 CGFloat Clamp(CGFloat value, CGFloat min, CGFloat max) {
   return std::max(min, std::min(max, value));
 }
 
 }  // namespace
 
 @interface ExtensionPopupController (Private)
 // Callers should be using the public static method for initialization.
 - (id)initWithParentWindow:(NSWindow*)parentWindow
                 anchoredAt:(NSPoint)anchoredAt
              arrowLocation:(info_bubble::BubbleArrowLocation)arrowLocation
                    devMode:(BOOL)devMode;
 
 // Set the ExtensionViewHost, taking ownership.
-- (void)setExtensionViewHost:(scoped_ptr<extensions::ExtensionViewHost>)host;
+- (void)setExtensionViewHost:(scoped_ptr<ExtensionViewHost>)host;
 
 // Called when the extension's hosted NSView has been resized.
 - (void)extensionViewFrameChanged;
 
 // Called when the extension's size changes.
 - (void)onSizeChanged:(NSSize)newSize;
 
 // Called when the extension view is shown.
 - (void)onViewDidShow;
 
@@ skipping 52 matching lines @@
                         withObject:nil
                         afterDelay:0.0];
     }
   }
 
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override {
     switch (type) {
       case extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_FIRST_LOAD: {
-        if (content::Details<extensions::ExtensionViewHost>(
+        if (content::Details<ExtensionViewHost>(
                 [controller_ extensionViewHost]) == details) {
           [controller_ showDevTools];
         }
         break;
       }
       default: {
         NOTREACHED() << "Received unexpected notification";
         break;
       }
     };
@@ skipping 89 matching lines @@
     }
   }
   if (!beingInspected_)
     [super windowDidResignKey:notification];
 }
 
 - (BOOL)isClosing {
   return [static_cast<InfoBubbleWindow*>([self window]) isClosing];
 }
 
-- (extensions::ExtensionViewHost*)extensionViewHost {
+- (ExtensionViewHost*)extensionViewHost {
   return host_.get();
 }
 
 - (void)setBeingInspected:(BOOL)beingInspected {
   beingInspected_ = beingInspected;
 }
 
-+ (ExtensionPopupController*)showURL:(GURL)url
-                           inBrowser:(Browser*)browser
-                          anchoredAt:(NSPoint)anchoredAt
-                       arrowLocation:(info_bubble::BubbleArrowLocation)
-                                         arrowLocation
-                             devMode:(BOOL)devMode {
++ (ExtensionPopupController*)host:(scoped_ptr<ExtensionViewHost>)host
+                        inBrowser:(Browser*)browser
+                       anchoredAt:(NSPoint)anchoredAt
+                    arrowLocation:(info_bubble::BubbleArrowLocation)
+                                      arrowLocation
+                          devMode:(BOOL)devMode {
   DCHECK([NSThread isMainThread]);
   DCHECK(browser);
-  if (!browser)
-    return nil;
+  DCHECK(host);
 
-  // If we click the browser/page action again, we should close the popup.
-  // Make Mac behavior the same with Windows and others.
-  if (gPopup) {
-    std::string extension_id = url.host();
-    std::string old_extension_id = [gPopup extensionViewHost]->extension_id();
+  if (gPopup)
     [gPopup close];  // Starts the animation to fade out the popup.
-    if (extension_id == old_extension_id)
-      return nil;
-  }
 
   // Create the popup first. This establishes an initially hidden NSWindow so
   // that the renderer is able to gather correct screen metrics for the initial
   // paint.
   gPopup = [[ExtensionPopupController alloc]
       initWithParentWindow:browser->window()->GetNativeWindow()
                 anchoredAt:anchoredAt
              arrowLocation:arrowLocation
                    devMode:devMode];
-
-  scoped_ptr<extensions::ExtensionViewHost> host(
-      extensions::ExtensionViewHostFactory::CreatePopupHost(url, browser));
-  DCHECK(host);
   [gPopup setExtensionViewHost:host.Pass()];
   return gPopup;
 }
 
 + (ExtensionPopupController*)popup {
   return gPopup;
 }
 
-- (void)setExtensionViewHost:(scoped_ptr<extensions::ExtensionViewHost>)host {
+- (void)setExtensionViewHost:(scoped_ptr<ExtensionViewHost>)host {
   DCHECK(!host_);
   DCHECK(host);
   host_.swap(host);
 
   extensionId_ = host_->extension_id();
   container_.reset(new ExtensionPopupContainer(self));
   ExtensionViewMac* hostView = static_cast<ExtensionViewMac*>(host_->view());
   hostView->set_container(container_.get());
   hostView->CreateWidgetHostViewIn([self bubble]);
 
@@ skipping 134 matching lines @@
   return minSize;
 }
 
 // Private (TestingAPI)
 + (NSSize)maxPopupSize {
   NSSize maxSize = {ExtensionViewMac::kMaxWidth, ExtensionViewMac::kMaxHeight};
   return maxSize;
 }
 
 @end