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"
@@ skipping 668 matching lines @@
     index = model_->OriginalIndexToIncognito(index);
 
   DCHECK(index >= 0 && index < static_cast<int>(browser_action_views_.size()));
 
   DeleteBrowserActionViews();
   CreateBrowserActionViews();
   Layout();
   SchedulePaint();
 }
 
+void BrowserActionsContainer::BrowserActionShowPopup(
+    const extensions::Extension* extension) {
+  // Do not override other popups and only show in active window.
+  if (popup_ || !browser_->window()->IsActive())
+    return;
+
+  BrowserActionButton* button = NULL;

[sky, 2013/10/16 22:26:07]

Did you try this? I think you want to nuke button, line 699 and have ShowPopup()
use (*it)->button(). I think.

[justinlin, 2013/10/17 04:14:52]

err, right. Was *just* about to compile it and test. I thought the change was
simple enough.. guess not.

Found a bug though, it's kind of weird how on Windows/views (and not on linux or
mac) it creates a "BrowserActionsContainer" even for windows that don't display
browser actions such as an extension's background page. Needed to add an extra
check that the window had a toolbar too. Not sure if it's worth filing a bug for
that or expected..

[Finnur, 2013/10/17 14:58:34]

Wait? A window is created for extension's background pages? Those have no UI so
that sounds wrong... Please file a bug.

[justinlin, 2013/10/17 18:32:53]

I mean when opening the console view of the background page. I think the window
makes sense, but I don't think a BrowserActionsContainer should be created for
the window. Filed bug 308645

+  for (BrowserActionViews::iterator it = browser_action_views_.begin();
+       it != browser_action_views_.end(); ++it) {
+    if ((*it)->button()->extension() == extension) {
+      if (button != NULL)
+        ShowPopup(button, ExtensionPopup::SHOW, false);
+      return;
+    }
+  }
+}
+
 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 109 matching lines @@
   // Only display incognito-enabled extensions while in incognito mode.
   return
       (!profile_->IsOffTheRecord() ||
        extensions::ExtensionSystem::Get(profile_)->extension_service()->
            IsIncognitoEnabled(extension->id()));
 }
 
 void BrowserActionsContainer::ShowPopup(
     BrowserActionButton* button,
     ExtensionPopup::ShowAction show_action) {
+  ShowPopup(button, show_action, true);
+}
+
+void BrowserActionsContainer::ShowPopup(
+    BrowserActionButton* button,
+    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;
   }
 
   // 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;
 
   // 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();
 }