Make the page action space show extensions with active content scripts or

chrome/browser/extensions/extension_tab_helper.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/extensions/extension_tab_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/page_action_controller.h"
+#include "chrome/browser/extensions/script_badge_controller.h"
 #include "chrome/browser/extensions/script_executor_impl.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
+#include "chrome/common/extensions/extension_switch_utils.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/image/image.h"
 
 using content::WebContents;
+using extensions::ScriptBadgeController;
 using extensions::ScriptExecutorImpl;
 using extensions::PageActionController;
 
 namespace {
 
 const char kPermissionError[] = "permission_error";
 
 }  // namespace
 
 ExtensionTabHelper::ExtensionTabHelper(TabContentsWrapper* wrapper)
     : content::WebContentsObserver(wrapper->web_contents()),
       delegate_(NULL),
       extension_app_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           extension_function_dispatcher_(wrapper->profile(), this)),
       wrapper_(wrapper) {
-  script_executor_.reset(new ScriptExecutorImpl(wrapper->web_contents()));
-  action_box_controller_.reset(new PageActionController(wrapper, this));
+  if (extensions::switch_utils::IsActionBoxEnabled()) {
+    script_badge_controller_.reset(new ScriptBadgeController(wrapper));
+  } else {
+    script_executor_.reset(new ScriptExecutorImpl(wrapper->web_contents()));
+    action_box_controller_.reset(new PageActionController(wrapper, this));
+  }
 }
 
 ExtensionTabHelper::~ExtensionTabHelper() {
 }
 
 void ExtensionTabHelper::CopyStateFrom(const ExtensionTabHelper& source) {
   SetExtensionApp(source.extension_app());
   extension_app_icon_ = source.extension_app_icon_;
 }
 
@@ skipping 44 matching lines @@
     UpdateExtensionAppIcon(extension);
 }
 
 SkBitmap* ExtensionTabHelper::GetExtensionAppIcon() {
   if (extension_app_icon_.empty())
     return NULL;
 
   return &extension_app_icon_;
 }
 
+extensions::ScriptExecutor* ExtensionTabHelper::script_executor() {
+  if (script_badge_controller_.get())
+    return script_badge_controller_.get();
+  return script_executor_.get();
+}
+
+extensions::ActionBoxController* ExtensionTabHelper::action_box_controller() {
+  if (script_badge_controller_.get())
+    return script_badge_controller_.get();
+  return action_box_controller_.get();
+}
+
 void ExtensionTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (details.is_in_page)
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   ExtensionService* service = profile->GetExtensionService();
   if (!service)
@@ skipping 235 matching lines @@
 void ExtensionTabHelper::OnInlineInstallFailure(int install_id,
                                                 int return_route_id,
                                                 const std::string& error) {
   Send(new ExtensionMsg_InlineWebstoreInstallResponse(
       return_route_id, install_id, false, error));
 }
 
 WebContents* ExtensionTabHelper::GetAssociatedWebContents() const {
   return web_contents();
 }