| Index: chrome/browser/extensions/page_action_controller.h
|
| diff --git a/chrome/browser/extensions/page_action_controller.h b/chrome/browser/extensions/page_action_controller.h
|
| index 6076dd47018b43ee48a2bd5d45904dd32a210de6..1abaf5e6b3072e053e0126581aba164abbfd029d 100644
|
| --- a/chrome/browser/extensions/page_action_controller.h
|
| +++ b/chrome/browser/extensions/page_action_controller.h
|
| @@ -5,21 +5,21 @@
|
| #ifndef CHROME_BROWSER_EXTENSIONS_PAGE_ACTION_CONTROLLER_H_
|
| #define CHROME_BROWSER_EXTENSIONS_PAGE_ACTION_CONTROLLER_H_
|
|
|
| -#include <string>
|
| -
|
| -#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
|
| +#include "base/macros.h"
|
| #include "chrome/browser/extensions/location_bar_controller.h"
|
|
|
| -class Profile;
|
| +namespace content {
|
| +class BrowserContext;
|
| +class WebContents;
|
| +}
|
|
|
| namespace extensions {
|
| -class ExtensionRegistry;
|
| +class Extension;
|
|
|
| // A LocationBarControllerProvider which populates the location bar with icons
|
| // based on the page_action extension API.
|
| // TODO(rdevlin.cronin): This isn't really a controller.
|
| -class PageActionController : public LocationBarController::ActionProvider,
|
| - public ExtensionActionAPI::Observer {
|
| +class PageActionController : public LocationBarController::ActionProvider {
|
| public:
|
| explicit PageActionController(content::WebContents* web_contents);
|
| virtual ~PageActionController();
|
| @@ -30,20 +30,11 @@ class PageActionController : public LocationBarController::ActionProvider,
|
| virtual void OnNavigated() OVERRIDE;
|
|
|
| private:
|
| - // ExtensionActionAPI::Observer implementation.
|
| - virtual void OnExtensionActionUpdated(
|
| - ExtensionAction* extension_action,
|
| - content::WebContents* web_contents,
|
| - content::BrowserContext* browser_context) OVERRIDE;
|
| -
|
| - // Returns the associated Profile.
|
| - Profile* GetProfile();
|
| -
|
| // The associated WebContents.
|
| content::WebContents* web_contents_;
|
|
|
| - ScopedObserver<ExtensionActionAPI, ExtensionActionAPI::Observer>
|
| - extension_action_observer_;
|
| + // The associated browser context.
|
| + content::BrowserContext* browser_context_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PageActionController);
|
| };
|
|
|