Chromium Code Reviews| Index: chrome/browser/extensions/extension_tab_helper.cc |
| diff --git a/chrome/browser/extensions/extension_tab_helper.cc b/chrome/browser/extensions/extension_tab_helper.cc |
| index 41936acecf948559fc03fb176ef81e744a49d234..234251cc52c9b4fcec811d4deba7e0961540e804 100644 |
| --- a/chrome/browser/extensions/extension_tab_helper.cc |
| +++ b/chrome/browser/extensions/extension_tab_helper.cc |
| @@ -5,6 +5,7 @@ |
| #include "chrome/browser/extensions/extension_tab_helper.h" |
| #include "chrome/browser/extensions/extension_service.h" |
| +#include "chrome/browser/extensions/extension_tab_util.h" |
|
Aaron Boodman
2012/06/08 05:31:30
Used?
not at google - send to devlin
2012/06/12 20:40:51
Done.
|
| #include "chrome/browser/extensions/page_action_controller.h" |
| #include "chrome/browser/extensions/script_badge_controller.h" |
| #include "chrome/browser/extensions/script_executor_impl.h" |
| @@ -30,11 +31,12 @@ |
| #include "content/public/browser/web_contents.h" |
| #include "ui/gfx/image/image.h" |
| +using content::RenderViewHost; |
| using content::WebContents; |
| using extensions::Extension; |
| +using extensions::PageActionController; |
| using extensions::ScriptBadgeController; |
| using extensions::ScriptExecutorImpl; |
| -using extensions::PageActionController; |
| namespace { |
| @@ -48,7 +50,8 @@ ExtensionTabHelper::ExtensionTabHelper(TabContentsWrapper* wrapper) |
| extension_app_(NULL), |
| ALLOW_THIS_IN_INITIALIZER_LIST( |
| extension_function_dispatcher_(wrapper->profile(), this)), |
| - wrapper_(wrapper) { |
| + wrapper_(wrapper), |
| + active_tab_permission_manager_(wrapper) { |
| if (extensions::switch_utils::IsActionBoxEnabled()) { |
| script_badge_controller_ = new ScriptBadgeController(wrapper); |
| } else { |
| @@ -74,6 +77,14 @@ void ExtensionTabHelper::GetApplicationInfo(int32 page_id) { |
| Send(new ExtensionMsg_GetApplicationInfo(routing_id(), page_id)); |
| } |
| +int ExtensionTabHelper::GetTabId() const { |
| + return wrapper_->restore_tab_helper()->session_id().id(); |
| +} |
| + |
| +int ExtensionTabHelper::GetWindowId() const { |
| + return wrapper_->restore_tab_helper()->window_id().id(); |
| +} |
| + |
| void ExtensionTabHelper::SetExtensionApp(const Extension* extension) { |
| DCHECK(!extension || extension->GetFullLaunchURL().is_valid()); |
| extension_app_ = extension; |
| @@ -120,6 +131,11 @@ extensions::LocationBarController* |
| return location_bar_controller_.get(); |
| } |
| +void ExtensionTabHelper::RenderViewCreated(RenderViewHost* render_view_host) { |
| + render_view_host->Send( |
| + new ExtensionMsg_SetTabId(render_view_host->GetRoutingID(), GetTabId())); |
| +} |
| + |
| void ExtensionTabHelper::DidNavigateMainFrame( |
| const content::LoadCommittedDetails& details, |
| const content::FrameNavigateParams& params) { |