[Extension Toolbar] Slide out overflowed actions for popups

chrome/browser/ui/views/extensions/extension_popup.cc

 // 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.
 
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 
 #include "base/bind.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_view_host.h"
-#include "chrome/browser/extensions/extension_view_host_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
@@ skipping 38 matching lines @@
   inspect_with_devtools_ = show_action == SHOW_AND_INSPECT;
   // Adjust the margin so that contents fit better.
   const int margin = views::BubbleBorder::GetCornerRadius() / 2;
   set_margins(gfx::Insets(margin, margin, margin, margin));
   SetLayoutManager(new views::FillLayout());
   AddChildView(GetExtensionView(host));
   GetExtensionView(host)->set_container(this);
   // ExtensionPopup closes itself on very specific de-activation conditions.
   set_close_on_deactivate(false);
 
-  // Wait to show the popup until the contained host finishes loading.
-  registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
-                 content::Source<content::WebContents>(host->host_contents()));
 
   // Listen for the containing view calling window.close();
   registrar_.Add(
       this,
       extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
       content::Source<content::BrowserContext>(host->browser_context()));
   content::DevToolsAgentHost::AddAgentStateCallback(devtools_callback_);
 
   GetExtensionView(host)->GetBrowser()->tab_strip_model()->AddObserver(this);
+
+  // If the host had somehow finished loading, then we'd miss the notification
+  // and not show.  This seems to happen in single-process mode.
+  if (host_->has_loaded_once()) {
+    ShowBubble();
+  } else {
+    // Wait to show the popup until the contained host finishes loading.
+    registrar_.Add(this,
+                   content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
+                   content::Source<content::WebContents>(
+                       host_->host_contents()));
+  }
 }
 
 ExtensionPopup::~ExtensionPopup() {
   content::DevToolsAgentHost::RemoveAgentStateCallback(devtools_callback_);
 
   GetExtensionView(
       host_.get())->GetBrowser()->tab_strip_model()->RemoveObserver(this);
 }
 
 void ExtensionPopup::Observe(int type,
@@ skipping 71 matching lines @@
   // TODO(msw): Find any remaining crashes related to http://crbug.com/327776
   // No calls are expected if the widget isn't initialized or no longer exists.
   CHECK(widget_initialized_);
   CHECK(GetWidget());
 
   if (!inspect_with_devtools_)
     GetWidget()->Close();
 }
 
 // static
-ExtensionPopup* ExtensionPopup::ShowPopup(const GURL& url,
-                                          Browser* browser,
-                                          views::View* anchor_view,
-                                          views::BubbleBorder::Arrow arrow,
-                                          ShowAction show_action) {
-  extensions::ExtensionViewHost* host =
-      extensions::ExtensionViewHostFactory::CreatePopupHost(url, browser);
-  auto popup = ExtensionPopup::Create(host, anchor_view, arrow, show_action);
-
-  // If the host had somehow finished loading, then we'd miss the notification
-  // and not show.  This seems to happen in single-process mode.
-  if (host->has_loaded_once())
-    popup->ShowBubble();
-
-  return popup;
+ExtensionPopup* ExtensionPopup::ShowPopup(
+    scoped_ptr<extensions::ExtensionViewHost> host,
+    views::View* anchor_view,
+    views::BubbleBorder::Arrow arrow,
+    ShowAction show_action) {
+  return ExtensionPopup::Create(
+      host.release(), anchor_view, arrow, show_action);
 }
 
 void ExtensionPopup::ShowBubble() {
   GetWidget()->Show();
 
   // Focus on the host contents when the bubble is first shown.
   host()->host_contents()->Focus();
 
   if (inspect_with_devtools_) {
     DevToolsWindow::OpenDevToolsWindow(host()->host_contents(),
                                        DevToolsToggleAction::ShowConsole());
   }
 }