[Extensions] Refactor extension action execution

chrome/browser/ui/extensions/extension_action_view_controller.cc

 // Copyright 2014 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/extensions/extension_action_view_controller.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action.h"
+#include "chrome/browser/extensions/extension_action_runner.h"
 #include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/extension_view_host_factory.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/extensions/accelerator_priority.h"
 #include "chrome/browser/ui/extensions/extension_action_platform_delegate.h"
 #include "chrome/browser/ui/extensions/icon_with_badge_image_source.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_constants.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
 using extensions::ActionInfo;
 using extensions::CommandService;
+using extensions::ExtensionActionRunner;
 
 ExtensionActionViewController::ExtensionActionViewController(
     const extensions::Extension* extension,
     Browser* browser,
     ExtensionAction* extension_action,
     ToolbarActionsBar* toolbar_actions_bar)
     : extension_(extension),
       browser_(browser),
       extension_action_(extension_action),
       toolbar_actions_bar_(toolbar_actions_bar),
@@ skipping 66 matching lines @@
   return GetAccessibleName(web_contents);
 }
 
 bool ExtensionActionViewController::IsEnabled(
     content::WebContents* web_contents) const {
   if (!ExtensionIsValid())
     return false;
 
   return extension_action_->GetIsVisible(
              SessionTabHelper::IdForTab(web_contents)) ||
-         extensions::ExtensionActionAPI::Get(browser_->profile())
-             ->HasBeenBlocked(extension(), web_contents);
+         HasBeenBlocked(web_contents);
 }
 
 bool ExtensionActionViewController::WantsToRun(
     content::WebContents* web_contents) const {
-  extensions::ExtensionActionAPI* action_api =
-      extensions::ExtensionActionAPI::Get(browser_->profile());
-  return action_api->PageActionWantsToRun(extension(), web_contents) ||
-         action_api->HasBeenBlocked(extension(), web_contents);
+  return ExtensionIsValid() &&
+         (PageActionWantsToRun(web_contents) || HasBeenBlocked(web_contents));
 }
 
 bool ExtensionActionViewController::HasPopup(
     content::WebContents* web_contents) const {
   if (!ExtensionIsValid())
     return false;
 
   int tab_id = SessionTabHelper::IdForTab(web_contents);
   return (tab_id < 0) ? false : extension_action_->HasPopup(tab_id);
 }
@@ skipping 59 matching lines @@
     return;
 
   view_delegate_->UpdateState();
 }
 
 bool ExtensionActionViewController::ExecuteAction(PopupShowAction show_action,
                                                   bool grant_tab_permissions) {
   if (!ExtensionIsValid())
     return false;
 
-  if (extensions::ExtensionActionAPI::Get(browser_->profile())
-          ->ExecuteExtensionAction(
-              extension_.get(), browser_, grant_tab_permissions) ==
+  content::WebContents* web_contents = view_delegate_->GetCurrentWebContents();
+  ExtensionActionRunner* action_runner =
+      ExtensionActionRunner::GetForWebContents(web_contents);
+  if (!action_runner)
+    return false;
+
+  if (action_runner->RunAction(extension(), grant_tab_permissions) ==
       ExtensionAction::ACTION_SHOW_POPUP) {
     GURL popup_url = extension_action_->GetPopupUrl(
         SessionTabHelper::IdForTab(view_delegate_->GetCurrentWebContents()));
     return GetPreferredPopupViewController()
         ->TriggerPopupWithUrl(show_action, popup_url, grant_tab_permissions);
   }
   return false;
 }
 
 void ExtensionActionViewController::RegisterCommand() {
@@ skipping 170 matching lines @@
     // If the extension doesn't want to run on the active web contents, we
     // grayscale it to indicate that.
     image_source->set_grayscale(!IsEnabled(web_contents));
     // If the action *does* want to run on the active web contents and is also
     // overflowed, we add a decoration so that the user can see which overflowed
     // action wants to run (since they wouldn't be able to see the change from
     // grayscale to color).
     bool is_overflow =
         toolbar_actions_bar_ && toolbar_actions_bar_->in_overflow_mode();
 
-    extensions::ExtensionActionAPI* api =
-        extensions::ExtensionActionAPI::Get(browser_->profile());
-    bool has_blocked_actions = api->HasBeenBlocked(extension(), web_contents);
+    bool has_blocked_actions = HasBeenBlocked(web_contents);
     image_source->set_paint_blocked_actions_decoration(has_blocked_actions);
     image_source->set_paint_page_action_decoration(
         !has_blocked_actions && is_overflow &&
-        api->PageActionWantsToRun(extension(), web_contents));
+        PageActionWantsToRun(web_contents));
   }
 
   return image_source;
 }
+
+bool ExtensionActionViewController::PageActionWantsToRun(
+    content::WebContents* web_contents) const {
+  return extension_action_->action_type() ==
+             extensions::ActionInfo::TYPE_PAGE &&
+         extension_action_->GetIsVisible(
+             SessionTabHelper::IdForTab(web_contents));
+}
+
+bool ExtensionActionViewController::HasBeenBlocked(
+    content::WebContents* web_contents) const {
+  ExtensionActionRunner* action_runner =
+      ExtensionActionRunner::GetForWebContents(web_contents);
+  return action_runner && action_runner->WantsToRun(extension());
+}