summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 11:09:00 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 11:09:00 +0000
commiteaa7dd18773869211fa0e19ed84392830c0978a8 (patch)
treed45899744e75811ef8a717f83580aab9ef6bf238 /chrome/browser/tab_contents
parent257ff5de808c52da6432b7f458b456b99a4d5278 (diff)
downloadchromium_src-eaa7dd18773869211fa0e19ed84392830c0978a8.zip
chromium_src-eaa7dd18773869211fa0e19ed84392830c0978a8.tar.gz
chromium_src-eaa7dd18773869211fa0e19ed84392830c0978a8.tar.bz2
Rename ExtensionsService to ExtensionService.
BUG=61409 TEST=trybots Review URL: http://codereview.chromium.org/5730004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/render_view_context_menu.cc12
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc4
-rw-r--r--chrome/browser/tab_contents/render_view_host_manager.cc6
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc8
4 files changed, 15 insertions, 15 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index a0cb149..37e9855 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -25,7 +25,7 @@
#include "chrome/browser/debugger/devtools_window.h"
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/extensions/extension_event_router.h"
-#include "chrome/browser/extensions/extensions_service.h"
+#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/fonts_languages_window.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/net/browser_url_util.h"
@@ -183,7 +183,7 @@ static ExtensionMenuItem::List GetRelevantExtensionItems(
void RenderViewContextMenu::AppendExtensionItems(
const std::string& extension_id, int* index) {
- ExtensionsService* service = profile_->GetExtensionsService();
+ ExtensionService* service = profile_->GetExtensionService();
ExtensionMenuManager* manager = service->menu_manager();
const Extension* extension = service->GetExtensionById(extension_id, false);
bool can_cross_incognito = service->CanCrossIncognito(extension);
@@ -302,7 +302,7 @@ void RenderViewContextMenu::RecursivelyAppendExtensionItems(
}
void RenderViewContextMenu::SetExtensionIcon(const std::string& extension_id) {
- ExtensionsService* service = profile_->GetExtensionsService();
+ ExtensionService* service = profile_->GetExtensionService();
ExtensionMenuManager* menu_manager = service->menu_manager();
int index = menu_model_.GetItemCount() - 1;
@@ -317,7 +317,7 @@ void RenderViewContextMenu::SetExtensionIcon(const std::string& extension_id) {
void RenderViewContextMenu::AppendAllExtensionItems() {
extension_item_map_.clear();
- ExtensionsService* service = profile_->GetExtensionsService();
+ ExtensionService* service = profile_->GetExtensionService();
if (!service)
return; // In unit-tests, we may not have an ExtensionService.
ExtensionMenuManager* menu_manager = service->menu_manager();
@@ -727,7 +727,7 @@ void RenderViewContextMenu::AppendBidiSubMenu() {
ExtensionMenuItem* RenderViewContextMenu::GetExtensionMenuItem(int id) const {
ExtensionMenuManager* manager =
- profile_->GetExtensionsService()->menu_manager();
+ profile_->GetExtensionService()->menu_manager();
std::map<int, ExtensionMenuItem::Id>::const_iterator i =
extension_item_map_.find(id);
if (i != extension_item_map_.end()) {
@@ -1084,7 +1084,7 @@ void RenderViewContextMenu::ExecuteCommand(int id) {
if (id >= IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST &&
id <= IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST) {
ExtensionMenuManager* manager =
- profile_->GetExtensionsService()->menu_manager();
+ profile_->GetExtensionService()->menu_manager();
std::map<int, ExtensionMenuItem::Id>::const_iterator i =
extension_item_map_.find(id);
if (i != extension_item_map_.end()) {
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 6714e29..408e490 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -9,7 +9,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/background_contents_service.h"
#include "chrome/browser/character_encoding.h"
-#include "chrome/browser/extensions/extensions_service.h"
+#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/renderer_host/render_view_host.h"
@@ -37,7 +37,7 @@ RenderViewHostDelegateViewHelper::MaybeCreateBackgroundContents(
SiteInstance* site,
const GURL& opener_url,
const string16& frame_name) {
- ExtensionsService* extensions_service = profile->GetExtensionsService();
+ ExtensionService* extensions_service = profile->GetExtensionService();
if (!opener_url.is_valid() ||
frame_name.empty() ||
diff --git a/chrome/browser/tab_contents/render_view_host_manager.cc b/chrome/browser/tab_contents/render_view_host_manager.cc
index af2b9e5..bcc9a78 100644
--- a/chrome/browser/tab_contents/render_view_host_manager.cc
+++ b/chrome/browser/tab_contents/render_view_host_manager.cc
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "chrome/browser/dom_ui/dom_ui.h"
#include "chrome/browser/dom_ui/dom_ui_factory.h"
-#include "chrome/browser/extensions/extensions_service.h"
+#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/renderer_host/render_view_host_delegate.h"
@@ -480,8 +480,8 @@ bool RenderViewHostManager::InitRenderView(RenderViewHost* render_view_host,
// Tell the RenderView whether it will be used for an extension process.
Profile* profile = delegate_->GetControllerForRenderManager().profile();
- bool is_extension_process = profile->GetExtensionsService() &&
- profile->GetExtensionsService()->ExtensionBindingsAllowed(entry.url());
+ bool is_extension_process = profile->GetExtensionService() &&
+ profile->GetExtensionService()->ExtensionBindingsAllowed(entry.url());
render_view_host->set_is_extension_process(is_extension_process);
return delegate_->CreateRenderViewForRenderManager(render_view_host);
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index e6f0cd7..4215528 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -39,7 +39,7 @@
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/download/download_request_limiter.h"
#include "chrome/browser/external_protocol_handler.h"
-#include "chrome/browser/extensions/extensions_service.h"
+#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/history/top_sites.h"
#include "chrome/browser/host_zoom_map.h"
@@ -595,7 +595,7 @@ void TabContents::SetExtensionAppById(const std::string& extension_app_id) {
if (extension_app_id.empty())
return;
- ExtensionsService* extension_service = profile()->GetExtensionsService();
+ ExtensionService* extension_service = profile()->GetExtensionService();
if (!extension_service || !extension_service->is_ready())
return;
@@ -1684,7 +1684,7 @@ void TabContents::DidNavigateMainFramePostCommit(
// Clear all page actions, blocked content notifications and browser actions
// for this tab, unless this is an in-page navigation.
if (!details.is_in_page) {
- ExtensionsService* service = profile()->GetExtensionsService();
+ ExtensionService* service = profile()->GetExtensionService();
if (service) {
for (size_t i = 0; i < service->extensions()->size(); ++i) {
ExtensionAction* browser_action =
@@ -3243,7 +3243,7 @@ void TabContents::UpdateExtensionAppIcon(const Extension* extension) {
}
const Extension* TabContents::GetExtensionContaining(const GURL& url) {
- ExtensionsService* extensions_service = profile()->GetExtensionsService();
+ ExtensionService* extensions_service = profile()->GetExtensionService();
if (!extensions_service)
return NULL;