Implement initial chrome.browserAction.openPopup API.

chrome/browser/ui/views/browser_actions_container.cc

Index: chrome/browser/ui/views/browser_actions_container.cc
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 850189762babaf027940beb6b62b50d63e4e86c2..beab802560335f9cc00a2e564d6963dc29845d01 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/browser_action_view.h"
@@ -459,7 +460,7 @@ void BrowserActionsContainer::OnWidgetDestroying(views::Widget* widget) {
 
 void BrowserActionsContainer::InspectPopup(ExtensionAction* action) {
   BrowserActionView* view = GetBrowserActionView(action);
-  ShowPopup(view->button(), ExtensionPopup::SHOW_AND_INSPECT);
+  ShowPopup(view->button(), ExtensionPopup::SHOW_AND_INSPECT, true);
 }
 
 int BrowserActionsContainer::GetCurrentTabId() const {
@@ -473,7 +474,7 @@ int BrowserActionsContainer::GetCurrentTabId() const {
 
 void BrowserActionsContainer::OnBrowserActionExecuted(
     BrowserActionButton* button) {
-  ShowPopup(button, ExtensionPopup::SHOW);
+  ShowPopup(button, ExtensionPopup::SHOW, true);
 }
 
 void BrowserActionsContainer::OnBrowserActionVisibilityChanged() {
@@ -686,6 +687,26 @@ void BrowserActionsContainer::BrowserActionMoved(const Extension* extension,
   SchedulePaint();
 }
 
+bool BrowserActionsContainer::BrowserActionShowPopup(
+    const extensions::Extension* extension) {
+  // Do not override other popups and only show in active window. The window
+  // must also have a toolbar, otherwise it should not be showing popups.
+  // Can remove toolbar check when http://crbug.com/308645 is fixed.

[Finnur, 2013/10/18 10:31:01]

TODO(justinlin): Remove toolbar check when ...

[justinlin, 2013/10/19 06:01:48]

Done.

+  if (popup_ ||
+      !browser_->window()->IsActive() ||
+      !browser_->window()->IsToolbarVisible()) {
+    return false;
+  }
+
+  for (BrowserActionViews::iterator it = browser_action_views_.begin();
+       it != browser_action_views_.end(); ++it) {
+    BrowserActionButton* button = (*it)->button();
+    if (button && button->extension() == extension)
+      return ShowPopup(button, ExtensionPopup::SHOW, false);
+  }
+  return false;
+}
+
 void BrowserActionsContainer::ModelLoaded() {
   SetContainerWidth();
 }
@@ -812,14 +833,16 @@ bool BrowserActionsContainer::ShouldDisplayBrowserAction(
            IsIncognitoEnabled(extension->id()));
 }
 
-void BrowserActionsContainer::ShowPopup(
+bool BrowserActionsContainer::ShowPopup(
     BrowserActionButton* button,
-    ExtensionPopup::ShowAction show_action) {
+    ExtensionPopup::ShowAction show_action,
+    bool should_grant) {
   const Extension* extension = button->extension();
   GURL popup_url;
-  if (model_->ExecuteBrowserAction(extension, browser_, &popup_url) !=
+  if (model_->ExecuteBrowserAction(
+          extension, browser_, &popup_url, should_grant) !=
       ExtensionToolbarModel::ACTION_SHOW_POPUP) {
-    return;
+    return false;
   }
 
   // If we're showing the same popup, just hide it and return.
@@ -830,7 +853,7 @@ void BrowserActionsContainer::ShowPopup(
   HidePopup();
 
   if (same_showing)
-    return;
+    return false;
 
   // We can get the execute event for browser actions that are not visible,
   // since buttons can be activated from the overflow menu (chevron). In that
@@ -845,5 +868,9 @@ void BrowserActionsContainer::ShowPopup(
                                      show_action);
   popup_->GetWidget()->AddObserver(this);
   popup_button_ = button;
-  popup_button_->SetButtonPushed();
+
+  // Only set button as pushed if it was triggered by a user click.
+  if (should_grant)
+    popup_button_->SetButtonPushed();
+  return true;
 }