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

chrome/browser/extensions/extension_tab_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_HELPER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_HELPER_H_
 #pragma once
 
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/extensions/app_notify_channel_setup.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/common/web_apps.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class Extension;
 class ExtensionTabHelperDelegate;
 class TabContentsWrapper;
 struct WebApplicationInfo;
 
 namespace content {
 struct LoadCommittedDetails;
 }
 
 namespace extensions {
 class ActionBoxController;
+class ScriptBadgeController;
 class ScriptExecutor;
 }
 
 // Per-tab extension helper. Also handles non-extension apps.
 class ExtensionTabHelper
     : public content::WebContentsObserver,
       public ExtensionFunctionDispatcher::Delegate,
       public ImageLoadingTracker::Observer,
       public WebstoreInlineInstaller::Delegate,
       public AppNotifyChannelSetup::Delegate,
@@ skipping 62 matching lines @@
   SkBitmap* GetExtensionAppIcon();
 
   TabContentsWrapper* tab_contents_wrapper() {
     return wrapper_;
   }
 
   content::WebContents* web_contents() const {
     return content::WebContentsObserver::web_contents();
   }
 
-  extensions::ScriptExecutor* script_executor() {
-    return script_executor_.get();
-  }
+  extensions::ScriptExecutor* script_executor();
 
-  extensions::ActionBoxController* action_box_controller() {
-    return action_box_controller_.get();
-  }
+  extensions::ActionBoxController* action_box_controller();
 
   // Sets a non-extension app icon associated with WebContents and fires an
   // INVALIDATE_TYPE_TITLE navigation state change to trigger repaint of title.
   void SetAppIcon(const SkBitmap& app_icon);
 
  private:
   // content::WebContentsObserver overrides.
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
@@ skipping 67 matching lines @@
   ExtensionFunctionDispatcher extension_function_dispatcher_;
 
   // Used for loading extension_app_icon_.
   scoped_ptr<ImageLoadingTracker> extension_app_image_loader_;
 
   // Cached web app info data.
   WebApplicationInfo web_app_info_;
 
   TabContentsWrapper* wrapper_;
 
+  // Either script_executor/action_box_controller will have values, or
+  // script_badge_controller will have a value, depending on whether the action
+  // box is turned on.
   scoped_ptr<extensions::ScriptExecutor> script_executor_;
-
   scoped_ptr<extensions::ActionBoxController> action_box_controller_;
+  scoped_ptr<extensions::ScriptBadgeController> script_badge_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionTabHelper);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_HELPER_H_