summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_message_service.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 03:02:34 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 03:02:34 +0000
commit1c321ee57a522e891d91a41a09bd900f0afd6f0d (patch)
treebb6e35526d52b50d8e37216e8605c7b4aa08c86a /chrome/browser/extensions/extension_message_service.cc
parente2a374f50043586ff684e0720bbbd99b9aa15c07 (diff)
downloadchromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.zip
chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.gz
chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.bz2
Move Extension into extensions namespace
BUG=117262 TBR=aa@chromium.org Review URL: https://chromiumcodereview.appspot.com/10375021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_message_service.cc')
-rw-r--r--chrome/browser/extensions/extension_message_service.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index d041527..c522eaf 100644
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -126,7 +126,7 @@ static content::RenderProcessHost* GetExtensionProcess(
Profile* profile, const std::string& extension_id) {
SiteInstance* site_instance =
profile->GetExtensionProcessManager()->GetSiteInstanceForURL(
- Extension::GetBaseURLFromExtensionId(extension_id));
+ extensions::Extension::GetBaseURLFromExtensionId(extension_id));
if (!site_instance->HasProcess())
return NULL;
@@ -430,7 +430,8 @@ bool ExtensionMessageService::MaybeAddPendingOpenChannelTask(
const OpenChannelParams& params) {
ExtensionService* service = profile->GetExtensionService();
const std::string& extension_id = params.target_extension_id;
- const Extension* extension = service->extensions()->GetByID(extension_id);
+ const extensions::Extension* extension = service->extensions()->GetByID(
+ extension_id);
if (extension && extension->has_lazy_background_page()) {
// If the extension uses spanning incognito mode, make sure we're always
// using the original profile since that is what the extension process