| Index: chrome/browser/extensions/extension_tab_helper.h
|
| diff --git a/chrome/browser/extensions/extension_tab_helper.h b/chrome/browser/extensions/extension_tab_helper.h
|
| index b7c28e5f7960d8a111c56861d6b8a5b40b38ffd9..f13b32ffe64ba3d9763ef851e810bb9691091061 100644
|
| --- a/chrome/browser/extensions/extension_tab_helper.h
|
| +++ b/chrome/browser/extensions/extension_tab_helper.h
|
| @@ -9,6 +9,7 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| +#include "chrome/browser/extensions/active_tab_permission_manager.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"
|
| @@ -58,6 +59,12 @@ class ExtensionTabHelper
|
| // the data is available.
|
| void GetApplicationInfo(int32 page_id);
|
|
|
| + // Gets the ID of the tab.
|
| + int GetTabId() const;
|
| +
|
| + // Gets the window ID of the tab.
|
| + int GetWindowId() const;
|
| +
|
| // App extensions ------------------------------------------------------------
|
|
|
| // Sets the extension denoting this as an app. If |extension| is non-null this
|
| @@ -102,12 +109,18 @@ class ExtensionTabHelper
|
|
|
| extensions::LocationBarController* location_bar_controller();
|
|
|
| + extensions::ActiveTabPermissionManager* active_tab_permission_manager() {
|
| + return &active_tab_permission_manager_;
|
| + }
|
| +
|
| // 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 RenderViewCreated(content::RenderViewHost* render_view_host)
|
| + OVERRIDE;
|
| virtual void DidNavigateMainFrame(
|
| const content::LoadCommittedDetails& details,
|
| const content::FrameNavigateParams& params) OVERRIDE;
|
| @@ -196,6 +209,8 @@ class ExtensionTabHelper
|
| scoped_ptr<extensions::LocationBarController> location_bar_controller_;
|
| scoped_refptr<extensions::ScriptBadgeController> script_badge_controller_;
|
|
|
| + extensions::ActiveTabPermissionManager active_tab_permission_manager_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionTabHelper);
|
| };
|
|
|
|
|