| Index: chrome/browser/ui/views/extensions/extension_action_view_controller.cc
|
| diff --git a/chrome/browser/ui/views/extensions/extension_action_view_controller.cc b/chrome/browser/ui/views/extensions/extension_action_view_controller.cc
|
| index e03d2968fcd5076781be3515969879ef41814500..05c1ac4768c6dadbb91c8e63d477eaac4057282d 100644
|
| --- a/chrome/browser/ui/views/extensions/extension_action_view_controller.cc
|
| +++ b/chrome/browser/ui/views/extensions/extension_action_view_controller.cc
|
| @@ -72,11 +72,8 @@ bool ExtensionActionViewController::ExecuteAction(
|
| ExecuteExtensionAction(extension_, browser_, grant_tab_permissions) ==
|
| ExtensionAction::ACTION_SHOW_POPUP) {
|
| GURL popup_url = extension_action_->GetPopupUrl(GetCurrentTabId());
|
| - if (delegate_->GetPreferredPopupViewController()->ShowPopupWithUrl(
|
| - show_action, popup_url)) {
|
| - delegate_->OnPopupShown(grant_tab_permissions);
|
| - return true;
|
| - }
|
| + return delegate_->GetPreferredPopupViewController()->ShowPopupWithUrl(
|
| + show_action, popup_url, grant_tab_permissions);
|
| }
|
| return false;
|
| }
|
| @@ -244,7 +241,9 @@ void ExtensionActionViewController::DoShowContextMenu(
|
| }
|
|
|
| bool ExtensionActionViewController::ShowPopupWithUrl(
|
| - ExtensionPopup::ShowAction show_action, const GURL& popup_url) {
|
| + ExtensionPopup::ShowAction show_action,
|
| + const GURL& popup_url,
|
| + bool grant_tab_permissions) {
|
| // If we're already showing the popup for this browser action, just hide it
|
| // and return.
|
| bool already_showing = popup_ != NULL;
|
| @@ -269,6 +268,8 @@ bool ExtensionActionViewController::ShowPopupWithUrl(
|
| popup_url, browser_, reference_view, arrow, show_action);
|
| popup_->GetWidget()->AddObserver(this);
|
|
|
| + delegate_->OnPopupShown(grant_tab_permissions);
|
| +
|
| return true;
|
| }
|
|
|
|
|