Moved ExtensionTabHelper into extensions namespace; rename it to TabHelper.
BUG=134721, 117261
Review URL: https://chromiumcodereview.appspot.com/10663043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146877 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/active_tab_permission_manager.cc b/chrome/browser/extensions/active_tab_permission_manager.cc
index 130d63a..fac7e648 100644
--- a/chrome/browser/extensions/active_tab_permission_manager.cc
+++ b/chrome/browser/extensions/active_tab_permission_manager.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/chrome_notification_types.h"
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index 7db3c85f..8eb6de5 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -9,7 +9,7 @@
#include "base/message_loop.h"
#include "base/values.h"
#include "chrome/browser/extensions/active_tab_permission_manager.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/tab_contents/test_tab_contents.h"
#include "chrome/common/chrome_notification_types.h"
diff --git a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
index 0a3779d..52bd570 100644
--- a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
@@ -11,7 +11,7 @@
#include "base/values.h"
#include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/location_bar_controller.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc
index 9d476206..8236a84a 100644
--- a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc
@@ -9,7 +9,7 @@
#include "base/string_number_conversions.h"
#include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/location_bar_controller.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
index 5f0c95e..e361396 100644
--- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_tabstrip.h"
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index 81aaabb95..45e3f57 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -14,7 +14,7 @@
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
diff --git a/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc b/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc
index b032775..ce091559b 100644
--- a/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc
+++ b/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/extensions/file_reader.h"
#include "chrome/browser/extensions/script_executor.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/tabs/tabs.cc b/chrome/browser/extensions/api/tabs/tabs.cc
index 9893434..8aa36f9 100644
--- a/chrome/browser/extensions/api/tabs/tabs.cc
+++ b/chrome/browser/extensions/api/tabs/tabs.cc
@@ -24,7 +24,7 @@
#include "chrome/browser/extensions/extension_function_util.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/extension_window_controller.h"
#include "chrome/browser/extensions/extension_window_list.h"
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
index f38f2486..355e3e7e 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -7,7 +7,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/extension_message_handler.h b/chrome/browser/extensions/extension_message_handler.h
index 0fdb1be..48cdbe9 100644
--- a/chrome/browser/extensions/extension_message_handler.h
+++ b/chrome/browser/extensions/extension_message_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -11,7 +11,8 @@
// Filters and dispatches extension-related IPC messages that arrive from
// renderers. There is one of these objects for each RenderViewHost in Chrome.
-// Contrast this with ExtensionTabHelper, which is only created for WebContents.
+// Contrast this with extensions::TabHelper, which is only created for
+// WebContents.
//
// TODO(aa): Handling of content script messaging should be able to move to EFD
// once there is an EFD for every RVHD where extension code can run. Then we
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index 3ae512c..40ce283 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/restore_tab_helper.h"
diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc
index 144b2b5..8ca5a349 100644
--- a/chrome/browser/extensions/extension_toolbar_model.cc
+++ b/chrome/browser/extensions/extension_toolbar_model.cc
@@ -7,7 +7,7 @@
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc
index b16abde..7a260bc2 100644
--- a/chrome/browser/extensions/menu_manager.cc
+++ b/chrome/browser/extensions/menu_manager.cc
@@ -16,7 +16,7 @@
#include "chrome/browser/extensions/extension_event_router.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/state_store.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/page_action_controller.cc b/chrome/browser/extensions/page_action_controller.cc
index 2d310c2..3c6e3d4 100644
--- a/chrome/browser/extensions/page_action_controller.cc
+++ b/chrome/browser/extensions/page_action_controller.cc
@@ -7,7 +7,7 @@
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/extensions/extension_set.h"
diff --git a/chrome/browser/extensions/page_action_controller_unittest.cc b/chrome/browser/extensions/page_action_controller_unittest.cc
index 94288d0..e498d88 100644
--- a/chrome/browser/extensions/page_action_controller_unittest.cc
+++ b/chrome/browser/extensions/page_action_controller_unittest.cc
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/extensions/page_action_controller.h"
#include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
diff --git a/chrome/browser/extensions/script_badge_controller.cc b/chrome/browser/extensions/script_badge_controller.cc
index 321d2521..a6a939a 100644
--- a/chrome/browser/extensions/script_badge_controller.cc
+++ b/chrome/browser/extensions/script_badge_controller.cc
@@ -7,7 +7,7 @@
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_action.h"
diff --git a/chrome/browser/extensions/script_badge_controller_unittest.cc b/chrome/browser/extensions/script_badge_controller_unittest.cc
index 65049696..9e2384f2 100644
--- a/chrome/browser/extensions/script_badge_controller_unittest.cc
+++ b/chrome/browser/extensions/script_badge_controller_unittest.cc
@@ -9,8 +9,8 @@
#include "base/message_loop.h"
#include "base/stringprintf.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/extensions/script_badge_controller.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/tab_contents/test_tab_contents.h"
diff --git a/chrome/browser/extensions/extension_tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
similarity index 78%
rename from chrome/browser/extensions/extension_tab_helper.cc
rename to chrome/browser/extensions/tab_helper.cc
index 451bc1e..5073e71 100644
--- a/chrome/browser/extensions/extension_tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -2,7 +2,7 @@
// 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/tab_helper.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/app_notify_channel_ui.h"
@@ -44,10 +44,6 @@
using content::NavigationEntry;
using content::RenderViewHost;
using content::WebContents;
-using extensions::Extension;
-using extensions::PageActionController;
-using extensions::ScriptBadgeController;
-using extensions::ScriptExecutor;
namespace {
@@ -55,17 +51,18 @@
} // namespace
-ExtensionTabHelper::ExtensionTabHelper(TabContents* tab_contents)
+namespace extensions {
+
+TabHelper::TabHelper(TabContents* tab_contents)
: content::WebContentsObserver(tab_contents->web_contents()),
extension_app_(NULL),
ALLOW_THIS_IN_INITIALIZER_LIST(
extension_function_dispatcher_(tab_contents->profile(), this)),
pending_web_app_action_(NONE),
tab_contents_(tab_contents),
- script_executor_(new extensions::ScriptExecutor(
- tab_contents->web_contents())),
+ script_executor_(new ScriptExecutor(tab_contents->web_contents())),
active_tab_permission_manager_(tab_contents) {
- if (extensions::switch_utils::AreScriptBadgesEnabled()) {
+ if (switch_utils::AreScriptBadgesEnabled()) {
location_bar_controller_.reset(new ScriptBadgeController(
tab_contents, script_executor_.get()));
} else {
@@ -77,15 +74,15 @@
&tab_contents->web_contents()->GetController()));
}
-ExtensionTabHelper::~ExtensionTabHelper() {
+TabHelper::~TabHelper() {
}
-void ExtensionTabHelper::CopyStateFrom(const ExtensionTabHelper& source) {
+void TabHelper::CopyStateFrom(const TabHelper& source) {
SetExtensionApp(source.extension_app());
extension_app_icon_ = source.extension_app_icon_;
}
-void ExtensionTabHelper::CreateApplicationShortcuts() {
+void TabHelper::CreateApplicationShortcuts() {
DCHECK(CanCreateApplicationShortcuts());
NavigationEntry* entry =
tab_contents_->web_contents()->GetController().GetLastCommittedEntry();
@@ -99,7 +96,7 @@
GetApplicationInfo(entry->GetPageID());
}
-bool ExtensionTabHelper::CanCreateApplicationShortcuts() const {
+bool TabHelper::CanCreateApplicationShortcuts() const {
#if defined(OS_MACOSX)
return false;
#else
@@ -108,15 +105,15 @@
#endif
}
-int ExtensionTabHelper::tab_id() const {
+int TabHelper::tab_id() const {
return tab_contents_->restore_tab_helper()->session_id().id();
}
-int ExtensionTabHelper::window_id() const {
+int TabHelper::window_id() const {
return tab_contents_->restore_tab_helper()->window_id().id();
}
-void ExtensionTabHelper::SetExtensionApp(const Extension* extension) {
+void TabHelper::SetExtensionApp(const Extension* extension) {
DCHECK(!extension || extension->GetFullLaunchURL().is_valid());
extension_app_ = extension;
@@ -124,37 +121,35 @@
content::NotificationService::current()->Notify(
chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
- content::Source<ExtensionTabHelper>(this),
+ content::Source<TabHelper>(this),
content::NotificationService::NoDetails());
}
-void ExtensionTabHelper::SetExtensionAppById(
- const std::string& extension_app_id) {
+void TabHelper::SetExtensionAppById(const std::string& extension_app_id) {
const Extension* extension = GetExtension(extension_app_id);
if (extension)
SetExtensionApp(extension);
}
-void ExtensionTabHelper::SetExtensionAppIconById(
- const std::string& extension_app_id) {
+void TabHelper::SetExtensionAppIconById(const std::string& extension_app_id) {
const Extension* extension = GetExtension(extension_app_id);
if (extension)
UpdateExtensionAppIcon(extension);
}
-SkBitmap* ExtensionTabHelper::GetExtensionAppIcon() {
+SkBitmap* TabHelper::GetExtensionAppIcon() {
if (extension_app_icon_.empty())
return NULL;
return &extension_app_icon_;
}
-void ExtensionTabHelper::RenderViewCreated(RenderViewHost* render_view_host) {
+void TabHelper::RenderViewCreated(RenderViewHost* render_view_host) {
render_view_host->Send(
new ExtensionMsg_SetTabId(render_view_host->GetRoutingID(), tab_id()));
}
-void ExtensionTabHelper::DidNavigateMainFrame(
+void TabHelper::DidNavigateMainFrame(
const content::LoadCommittedDetails& details,
const content::FrameNavigateParams& params) {
if (details.is_in_page)
@@ -180,9 +175,9 @@
}
}
-bool ExtensionTabHelper::OnMessageReceived(const IPC::Message& message) {
+bool TabHelper::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
- IPC_BEGIN_MESSAGE_MAP(ExtensionTabHelper, message)
+ IPC_BEGIN_MESSAGE_MAP(TabHelper, message)
IPC_MESSAGE_HANDLER(ExtensionHostMsg_DidGetApplicationInfo,
OnDidGetApplicationInfo)
IPC_MESSAGE_HANDLER(ExtensionHostMsg_InstallApplication,
@@ -199,8 +194,8 @@
return handled;
}
-void ExtensionTabHelper::OnDidGetApplicationInfo(
- int32 page_id, const WebApplicationInfo& info) {
+void TabHelper::OnDidGetApplicationInfo(int32 page_id,
+ const WebApplicationInfo& info) {
// Android does not implement BrowserWindow.
#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
web_app_info_ = info;
@@ -230,7 +225,7 @@
#endif
}
-void ExtensionTabHelper::OnInstallApplication(const WebApplicationInfo& info) {
+void TabHelper::OnInstallApplication(const WebApplicationInfo& info) {
Profile* profile =
Profile::FromBrowserContext(web_contents()->GetBrowserContext());
ExtensionService* extension_service = profile->GetExtensionService();
@@ -250,32 +245,30 @@
installer->InstallWebApp(info);
}
-void ExtensionTabHelper::OnInlineWebstoreInstall(
+void TabHelper::OnInlineWebstoreInstall(
int install_id,
int return_route_id,
const std::string& webstore_item_id,
const GURL& requestor_url) {
- scoped_refptr<extensions::WebstoreInlineInstaller> installer(
- new extensions::WebstoreInlineInstaller(
- web_contents(),
- install_id,
- return_route_id,
- webstore_item_id,
- requestor_url,
- this));
+ scoped_refptr<WebstoreInlineInstaller> installer(new WebstoreInlineInstaller(
+ web_contents(),
+ install_id,
+ return_route_id,
+ webstore_item_id,
+ requestor_url,
+ this));
installer->BeginInstall();
}
-void ExtensionTabHelper::OnGetAppNotifyChannel(
- const GURL& requestor_url,
- const std::string& client_id,
- int return_route_id,
- int callback_id) {
+void TabHelper::OnGetAppNotifyChannel(const GURL& requestor_url,
+ const std::string& client_id,
+ int return_route_id,
+ int callback_id) {
// Check for permission first.
Profile* profile =
Profile::FromBrowserContext(web_contents()->GetBrowserContext());
ExtensionService* extension_service = profile->GetExtensionService();
- extensions::ProcessMap* process_map = extension_service->process_map();
+ ProcessMap* process_map = extension_service->process_map();
content::RenderProcessHost* process =
tab_contents()->web_contents()->GetRenderProcessHost();
const Extension* extension =
@@ -283,8 +276,7 @@
std::string error;
if (!extension ||
- !extension->HasAPIPermission(
- extensions::APIPermission::kAppNotifications) ||
+ !extension->HasAPIPermission(APIPermission::kAppNotifications) ||
!process_map->Contains(extension->id(), process->GetID()))
error = kPermissionError;
@@ -317,9 +309,9 @@
// We'll get called back in AppNotifyChannelSetupComplete.
}
-void ExtensionTabHelper::OnGetAppInstallState(const GURL& requestor_url,
- int return_route_id,
- int callback_id) {
+void TabHelper::OnGetAppInstallState(const GURL& requestor_url,
+ int return_route_id,
+ int callback_id) {
Profile* profile =
Profile::FromBrowserContext(web_contents()->GetBrowserContext());
ExtensionService* extension_service = profile->GetExtensionService();
@@ -339,7 +331,7 @@
return_route_id, state, callback_id));
}
-void ExtensionTabHelper::AppNotifyChannelSetupComplete(
+void TabHelper::AppNotifyChannelSetupComplete(
const std::string& channel_id,
const std::string& error,
const AppNotifyChannelSetup* setup) {
@@ -359,14 +351,12 @@
setup->return_route_id(), channel_id, error, setup->callback_id()));
}
-void ExtensionTabHelper::OnRequest(
- const ExtensionHostMsg_Request_Params& request) {
+void TabHelper::OnRequest(const ExtensionHostMsg_Request_Params& request) {
extension_function_dispatcher_.Dispatch(request,
web_contents()->GetRenderViewHost());
}
-const Extension* ExtensionTabHelper::GetExtension(
- const std::string& extension_app_id) {
+const Extension* TabHelper::GetExtension(const std::string& extension_app_id) {
if (extension_app_id.empty())
return NULL;
@@ -381,7 +371,7 @@
return extension;
}
-void ExtensionTabHelper::UpdateExtensionAppIcon(const Extension* extension) {
+void TabHelper::UpdateExtensionAppIcon(const Extension* extension) {
extension_app_icon_.reset();
if (extension) {
@@ -398,22 +388,21 @@
}
}
-void ExtensionTabHelper::SetAppIcon(const SkBitmap& app_icon) {
+void TabHelper::SetAppIcon(const SkBitmap& app_icon) {
extension_app_icon_ = app_icon;
web_contents()->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TITLE);
}
-void ExtensionTabHelper::OnImageLoaded(const gfx::Image& image,
- const std::string& extension_id,
- int index) {
+void TabHelper::OnImageLoaded(const gfx::Image& image,
+ const std::string& extension_id,
+ int index) {
if (!image.IsEmpty()) {
extension_app_icon_ = *image.ToSkBitmap();
web_contents()->NotifyNavigationStateChanged(content::INVALIDATE_TYPE_TAB);
}
}
-ExtensionWindowController*
-ExtensionTabHelper::GetExtensionWindowController() const {
+ExtensionWindowController* TabHelper::GetExtensionWindowController() const {
content::WebContents* contents = web_contents();
TabContentsIterator tab_iterator;
for (; !tab_iterator.done(); ++tab_iterator) {
@@ -424,30 +413,29 @@
return NULL;
}
-void ExtensionTabHelper::OnInlineInstallSuccess(int install_id,
- int return_route_id) {
+void TabHelper::OnInlineInstallSuccess(int install_id, int return_route_id) {
Send(new ExtensionMsg_InlineWebstoreInstallResponse(
return_route_id, install_id, true, ""));
}
-void ExtensionTabHelper::OnInlineInstallFailure(int install_id,
- int return_route_id,
- const std::string& error) {
+void TabHelper::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 {
+WebContents* TabHelper::GetAssociatedWebContents() const {
return web_contents();
}
-void ExtensionTabHelper::GetApplicationInfo(int32 page_id) {
+void TabHelper::GetApplicationInfo(int32 page_id) {
Send(new ExtensionMsg_GetApplicationInfo(routing_id(), page_id));
}
-void ExtensionTabHelper::Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+void TabHelper::Observe(int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
DCHECK(type == content::NOTIFICATION_LOAD_STOP);
const NavigationController& controller =
*content::Source<NavigationController>(source).ptr();
@@ -465,3 +453,5 @@
pending_web_app_action_ = NONE;
}
}
+
+} // namespace extensions
diff --git a/chrome/browser/extensions/extension_tab_helper.h b/chrome/browser/extensions/tab_helper.h
similarity index 82%
rename from chrome/browser/extensions/extension_tab_helper.h
rename to chrome/browser/extensions/tab_helper.h
index 723de2b5b..13cac4e4 100644
--- a/chrome/browser/extensions/extension_tab_helper.h
+++ b/chrome/browser/extensions/tab_helper.h
@@ -2,8 +2,8 @@
// 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_
+#ifndef CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
+#define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
@@ -31,17 +31,15 @@
class LocationBarController;
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 extensions::WebstoreInlineInstaller::Delegate,
- public AppNotifyChannelSetup::Delegate,
- public base::SupportsWeakPtr<ExtensionTabHelper>,
- public content::NotificationObserver {
+class TabHelper : public content::WebContentsObserver,
+ public ExtensionFunctionDispatcher::Delegate,
+ public ImageLoadingTracker::Observer,
+ public WebstoreInlineInstaller::Delegate,
+ public AppNotifyChannelSetup::Delegate,
+ public base::SupportsWeakPtr<TabHelper>,
+ public content::NotificationObserver {
public:
// Different types of action when web app info is available.
// OnDidGetApplicationInfo uses this to dispatch calls.
@@ -51,11 +49,11 @@
UPDATE_SHORTCUT // Update icon for app shortcut.
};
- explicit ExtensionTabHelper(TabContents* tab_contents);
- virtual ~ExtensionTabHelper();
+ explicit TabHelper(TabContents* tab_contents);
+ virtual ~TabHelper();
- // Copies the internal state from another ExtensionTabHelper.
- void CopyStateFrom(const ExtensionTabHelper& source);
+ // Copies the internal state from another TabHelper.
+ void CopyStateFrom(const TabHelper& source);
void CreateApplicationShortcuts();
bool CanCreateApplicationShortcuts() const;
@@ -79,7 +77,7 @@
// NOTE: this should only be manipulated before the tab is added to a browser.
// TODO(sky): resolve if this is the right way to identify an app tab. If it
// is, than this should be passed in the constructor.
- void SetExtensionApp(const extensions::Extension* extension);
+ void SetExtensionApp(const Extension* extension);
// Convenience for setting the app extension by id. This does nothing if
// |extension_app_id| is empty, or an extension can't be found given the
@@ -89,7 +87,7 @@
// Set just the app icon, used by panels created by an extension.
void SetExtensionAppIconById(const std::string& extension_app_id);
- const extensions::Extension* extension_app() const { return extension_app_; }
+ const Extension* extension_app() const { return extension_app_; }
bool is_app() const { return extension_app_ != NULL; }
const WebApplicationInfo& web_app_info() const {
return web_app_info_;
@@ -110,15 +108,15 @@
return content::WebContentsObserver::web_contents();
}
- extensions::ScriptExecutor* script_executor() {
+ ScriptExecutor* script_executor() {
return script_executor_.get();
}
- extensions::LocationBarController* location_bar_controller() {
+ LocationBarController* location_bar_controller() {
return location_bar_controller_.get();
}
- extensions::ActiveTabPermissionManager* active_tab_permission_manager() {
+ ActiveTabPermissionManager* active_tab_permission_manager() {
return &active_tab_permission_manager_;
}
@@ -160,9 +158,9 @@
// Resets app_icon_ and if |extension| is non-null creates a new
// ImageLoadingTracker to load the extension's image.
- void UpdateExtensionAppIcon(const extensions::Extension* extension);
+ void UpdateExtensionAppIcon(const Extension* extension);
- const extensions::Extension* GetExtension(
+ const Extension* GetExtension(
const std::string& extension_app_id);
// ImageLoadingTracker::Observer.
@@ -170,7 +168,7 @@
const std::string& extension_id,
int index) OVERRIDE;
- // extensions::WebstoreInlineInstaller::Delegate.
+ // WebstoreInlineInstaller::Delegate.
virtual void OnInlineInstallSuccess(int install_id,
int return_route_id) OVERRIDE;
virtual void OnInlineInstallFailure(int install_id,
@@ -201,7 +199,7 @@
// If non-null this tab is an app tab and this is the extension the tab was
// created for.
- const extensions::Extension* extension_app_;
+ const Extension* extension_app_;
// Icon for extension_app_ (if non-null) or a manually-set icon for
// non-extension apps.
@@ -224,13 +222,15 @@
TabContents* tab_contents_;
- scoped_ptr<extensions::ScriptExecutor> script_executor_;
+ scoped_ptr<ScriptExecutor> script_executor_;
- scoped_ptr<extensions::LocationBarController> location_bar_controller_;
+ scoped_ptr<LocationBarController> location_bar_controller_;
- extensions::ActiveTabPermissionManager active_tab_permission_manager_;
+ ActiveTabPermissionManager active_tab_permission_manager_;
- DISALLOW_COPY_AND_ASSIGN(ExtensionTabHelper);
+ DISALLOW_COPY_AND_ASSIGN(TabHelper);
};
-#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_HELPER_H_
+} // namespace extensions
+
+#endif // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
index 5c945b84..71879f8 100644
--- a/chrome/browser/sessions/session_service.cc
+++ b/chrome/browser/sessions/session_service.cc
@@ -18,7 +18,7 @@
#include "base/metrics/histogram.h"
#include "base/pickle.h"
#include "base/threading/thread.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/restore_tab_helper.h"
@@ -695,8 +695,8 @@
}
case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: {
- ExtensionTabHelper* extension_tab_helper =
- content::Source<ExtensionTabHelper>(source).ptr();
+ extensions::TabHelper* extension_tab_helper =
+ content::Source<extensions::TabHelper>(source).ptr();
if (extension_tab_helper->tab_contents()->profile() != profile())
return;
if (extension_tab_helper->extension_app()) {
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc
index 8464020..76d97bd5 100644
--- a/chrome/browser/sessions/tab_restore_service.cc
+++ b/chrome/browser/sessions/tab_restore_service.cc
@@ -15,7 +15,7 @@
#include "base/metrics/histogram.h"
#include "base/stl_util.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_service.h"
#include "chrome/browser/sessions/session_service_factory.h"
diff --git a/chrome/browser/sync/glue/session_change_processor.cc b/chrome/browser/sync/glue/session_change_processor.cc
index c055b072..65666ba 100644
--- a/chrome/browser/sync/glue/session_change_processor.cc
+++ b/chrome/browser/sync/glue/session_change_processor.cc
@@ -8,7 +8,7 @@
#include <vector>
#include "base/logging.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/history/history_notifications.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/glue/session_model_associator.h"
@@ -180,8 +180,8 @@
}
case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: {
- ExtensionTabHelper* extension_tab_helper =
- content::Source<ExtensionTabHelper>(source).ptr();
+ extensions::TabHelper* extension_tab_helper =
+ content::Source<extensions::TabHelper>(source).ptr();
if (!extension_tab_helper ||
extension_tab_helper->web_contents()->GetBrowserContext() !=
profile_) {
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 0a36a46f..5998ad3 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -52,7 +52,7 @@
#include "chrome/browser/extensions/default_apps_trial.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/file_select_helper.h"
#include "chrome/browser/first_run/first_run.h"
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 7763f14..de6a5ce 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -18,7 +18,7 @@
#include "chrome/browser/defaults.h"
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 7c98236..5ff86c5 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -17,7 +17,7 @@
#include "chrome/browser/debugger/devtools_window.h"
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/platform_util.h"
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 26198d2..a152a6e 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -11,7 +11,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_about_handler.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/google/google_url_tracker.h"
#include "chrome/browser/google/google_util.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc
index 74aca77..0162498 100644
--- a/chrome/browser/ui/browser_tabrestore.cc
+++ b/chrome/browser/ui/browser_tabrestore.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/browser_tabrestore.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/sessions/session_service.h"
#include "chrome/browser/sessions/session_service_factory.h"
#include "chrome/browser/tab_contents/tab_util.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index 442bb39..54fbe42 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
@@ -20,8 +20,8 @@
#include "chrome/browser/extensions/api/tabs/tabs.h"
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/extensions/location_bar_controller.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/instant/instant_controller.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
index 7e7f247..103081e2 100644
--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
@@ -9,9 +9,9 @@
#include "base/sys_string_conversions.h"
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/location_bar_controller.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
#import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index a03a843..796c712 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -15,7 +15,7 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/debugger/devtools_window.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/thumbnail_generator.h"
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index e50ec7b..ef20292 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -20,7 +20,7 @@
#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
#include "chrome/browser/autocomplete/autocomplete_match.h"
#include "chrome/browser/debugger/devtools_window.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prefs/pref_service.h"
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc
index 5781138..3f93e58 100644
--- a/chrome/browser/ui/extensions/application_launch.cc
+++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -10,8 +10,8 @@
#include "chrome/browser/extensions/default_apps_trial.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/extensions/platform_app_launcher.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
@@ -337,12 +337,12 @@
TabContents* tab_contents = TabContents::FromWebContents(tab);
// Set UPDATE_SHORTCUT as the pending web app action. This action is picked
// up in LoadingStateChanged to schedule a GetApplicationInfo. And when
- // the web app info is available, ExtensionTabHelper notifies Browser via
+ // the web app info is available, extensions::TabHelper notifies Browser via
// OnDidGetApplicationInfo, which calls
// web_app::UpdateShortcutForTabContents when it sees UPDATE_SHORTCUT as
// pending web app action.
tab_contents->extension_tab_helper()->set_pending_web_app_action(
- ExtensionTabHelper::UPDATE_SHORTCUT);
+ extensions::TabHelper::UPDATE_SHORTCUT);
return tab;
}
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index 8c68b03..a15e68c0 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -28,9 +28,9 @@
#include "chrome/browser/extensions/api/commands/command_service_factory.h"
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/location_bar_controller.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/instant/instant_controller.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/gtk/tabs/dragged_view_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_view_gtk.cc
index 5160fd81..dc69869 100644
--- a/chrome/browser/ui/gtk/tabs/dragged_view_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/dragged_view_gtk.cc
@@ -11,7 +11,7 @@
#include "base/debug/trace_event.h"
#include "base/i18n/rtl.h"
#include "base/stl_util.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
index 312e313..15abf63c 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
@@ -10,7 +10,7 @@
#include "base/debug/trace_event.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/defaults.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc
index 0476c0a..68808bf 100644
--- a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc
+++ b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/sessions/restore_tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/ui/tab_contents/tab_contents.cc b/chrome/browser/ui/tab_contents/tab_contents.cc
index 2c46a3d2..3d950f4 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/external_protocol/external_protocol_observer.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/history/history_tab_helper.h"
@@ -102,7 +102,7 @@
#endif
constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this));
core_tab_helper_.reset(new CoreTabHelper(contents));
- extension_tab_helper_.reset(new ExtensionTabHelper(this));
+ extension_tab_helper_.reset(new extensions::TabHelper(this));
favicon_tab_helper_.reset(new FaviconTabHelper(contents));
find_tab_helper_.reset(new FindTabHelper(contents));
history_tab_helper_.reset(new HistoryTabHelper(contents));
diff --git a/chrome/browser/ui/tab_contents/tab_contents.h b/chrome/browser/ui/tab_contents/tab_contents.h
index a6eb5eb..0004fa01 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.h
+++ b/chrome/browser/ui/tab_contents/tab_contents.h
@@ -21,7 +21,6 @@
class BookmarkTabHelper;
class ConstrainedWindowTabHelper;
class CoreTabHelper;
-class ExtensionTabHelper;
class ExternalProtocolObserver;
class FaviconTabHelper;
class FindTabHelper;
@@ -65,6 +64,7 @@
}
namespace extensions {
+class TabHelper;
class WebNavigationTabObserver;
}
@@ -159,11 +159,11 @@
CoreTabHelper* core_tab_helper() { return core_tab_helper_.get(); }
- ExtensionTabHelper* extension_tab_helper() {
+ extensions::TabHelper* extension_tab_helper() {
return extension_tab_helper_.get();
}
- const ExtensionTabHelper* extension_tab_helper() const {
+ const extensions::TabHelper* extension_tab_helper() const {
return extension_tab_helper_.get();
}
@@ -266,7 +266,7 @@
#endif
scoped_ptr<ConstrainedWindowTabHelper> constrained_window_tab_helper_;
scoped_ptr<CoreTabHelper> core_tab_helper_;
- scoped_ptr<ExtensionTabHelper> extension_tab_helper_;
+ scoped_ptr<extensions::TabHelper> extension_tab_helper_;
scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
scoped_ptr<FindTabHelper> find_tab_helper_;
scoped_ptr<HistoryTabHelper> history_tab_helper_;
diff --git a/chrome/browser/ui/tabs/pinned_tab_codec.cc b/chrome/browser/ui/tabs/pinned_tab_codec.cc
index 44de318d..a147a5cf 100644
--- a/chrome/browser/ui/tabs/pinned_tab_codec.cc
+++ b/chrome/browser/ui/tabs/pinned_tab_codec.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/ui/tabs/pinned_tab_codec.h"
#include "base/values.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc
index 5a0bf198..2fb5190 100644
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -18,7 +18,7 @@
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/tab_restore_service.h"
#include "chrome/browser/ui/tab_contents/core_tab_helper.h"
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
index d9362d9..8b7e5e2 100644
--- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
@@ -18,7 +18,7 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/defaults.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_tabstrip.h"
diff --git a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc
index 7a3b328..3dde3c8 100644
--- a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc
+++ b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc
@@ -9,7 +9,7 @@
#include "ash/shell.h"
#include "ash/wm/window_util.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index 130d0b1..9671807 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -10,7 +10,7 @@
#include "base/bind_helpers.h"
#include "base/utf_string_conversions.h"
#include "base/win/windows_version.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 3321477..65f642d 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -17,7 +17,7 @@
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/debugger/devtools_window.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/instant/instant_controller.h"
#include "chrome/browser/managed_mode.h"
#include "chrome/browser/native_window_notification_source.h"
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 4894ff69..fc1c4cb6 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -18,8 +18,8 @@
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/extensions/location_bar_controller.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/instant/instant_controller.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
index b23449c9..d744442a 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
@@ -10,9 +10,9 @@
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_context_menu_model.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/extensions/location_bar_controller.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_list.h"
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index ff0fa32..57fdbe7 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -7,7 +7,7 @@
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc
index ed55194d..861a01e 100644
--- a/chrome/browser/ui/web_applications/web_app_ui.cc
+++ b/chrome/browser/ui/web_applications/web_app_ui.cc
@@ -11,7 +11,7 @@
#include "base/string16.h"
#include "base/utf_string_conversions.h"
#include "base/win/windows_version.h"
-#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 8a0c006..dbc98cdf1 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -385,8 +385,6 @@
'browser/extensions/extension_system_factory.h',
'browser/extensions/extension_sync_data.cc',
'browser/extensions/extension_sync_data.h',
- 'browser/extensions/extension_tab_helper.cc',
- 'browser/extensions/extension_tab_helper.h',
'browser/extensions/extension_tab_id_map.cc',
'browser/extensions/extension_tab_id_map.h',
'browser/extensions/extension_tab_util.cc',
@@ -481,6 +479,8 @@
'browser/extensions/shell_window_registry.h',
'browser/extensions/state_store.cc',
'browser/extensions/state_store.h',
+ 'browser/extensions/tab_helper.cc',
+ 'browser/extensions/tab_helper.h',
'browser/extensions/theme_installed_infobar_delegate.cc',
'browser/extensions/theme_installed_infobar_delegate.h',
'browser/extensions/unpacked_installer.cc',
diff --git a/chrome/common/chrome_notification_types.h b/chrome/common/chrome_notification_types.h
index fa586e8..83bb5b5d 100644
--- a/chrome/common/chrome_notification_types.h
+++ b/chrome/common/chrome_notification_types.h
@@ -136,9 +136,9 @@
// MetricEventDurationDetails.
NOTIFICATION_METRIC_EVENT_DURATION,
- // This notification is sent when ExtensionTabHelper::SetExtensionApp is
- // invoked. The source is the ExtensionTabHelper SetExtensionApp was invoked
- // on.
+ // This notification is sent when extensions::TabHelper::SetExtensionApp is
+ // invoked. The source is the extensions::TabHelper SetExtensionApp was
+ // invoked on.
NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
// Notification posted when the element that is focused and currently accepts
