Implement initial chrome.browserAction.openPopup API.

chrome/browser/ui/views/browser_actions_container.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/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #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"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 426 matching lines @@
   popup_ = NULL;
   // |popup_button_| is NULL if the extension has been removed.
   if (popup_button_) {
     popup_button_->SetButtonNotPushed();
     popup_button_ = NULL;
   }
 }
 
 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 {
   content::WebContents* active_tab =
       browser_->tab_strip_model()->GetActiveWebContents();
   if (!active_tab)
     return -1;
 
   return SessionTabHelper::FromWebContents(active_tab)->session_id().id();
 }
 
 void BrowserActionsContainer::OnBrowserActionExecuted(
     BrowserActionButton* button) {
-  ShowPopup(button, ExtensionPopup::SHOW);
+  ShowPopup(button, ExtensionPopup::SHOW, true);
 }
 
 void BrowserActionsContainer::OnBrowserActionVisibilityChanged() {
   SetVisible(!browser_action_views_.empty());
   owner_view_->Layout();
   owner_view_->SchedulePaint();
 }
 
 gfx::Point BrowserActionsContainer::GetViewContentOffset() const {
   return gfx::Point(0, ToolbarView::kVertSpacing);
@@ skipping 192 matching lines @@
     index = model_->OriginalIndexToIncognito(index);
 
   DCHECK(index >= 0 && index < static_cast<int>(browser_action_views_.size()));
 
   DeleteBrowserActionViews();
   CreateBrowserActionViews();
   Layout();
   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();
 }
 
 void BrowserActionsContainer::LoadImages() {
   ui::ThemeProvider* tp = GetThemeProvider();
   chevron_->SetIcon(*tp->GetImageSkiaNamed(IDR_BROWSER_ACTIONS_OVERFLOW));
   chevron_->SetHoverIcon(*tp->GetImageSkiaNamed(
       IDR_BROWSER_ACTIONS_OVERFLOW_H));
   chevron_->SetPushedIcon(*tp->GetImageSkiaNamed(
@@ skipping 106 matching lines @@
 
 bool BrowserActionsContainer::ShouldDisplayBrowserAction(
     const Extension* extension) {
   // Only display incognito-enabled extensions while in incognito mode.
   return
       (!profile_->IsOffTheRecord() ||
        extensions::ExtensionSystem::Get(profile_)->extension_service()->
            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.
   bool same_showing = popup_ && button == popup_button_;
 
   // Always hide the current popup, even if it's not the same.
   // Only one popup should be visible at a time.
   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
   // case we show the popup as originating from the chevron.
   View* reference_view = button->parent()->visible() ? button : chevron_;
   views::BubbleBorder::Arrow arrow = base::i18n::IsRTL() ?
       views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;
   popup_ = ExtensionPopup::ShowPopup(popup_url,
                                      browser_,
                                      reference_view,
                                      arrow,
                                      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;
 }