Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2344)

Unified Diff: chrome/browser/renderer_host/chrome_render_message_filter.cc

Issue 10626007: Move ExtensionSystem into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Master merge; moved class declaration Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | chrome/browser/speech/speech_input_extension_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/chrome_render_message_filter.cc
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
index cb1855b161f8564aa4502b9e6b131b611aece4ce..6ca69d6150c277769819b00ee3b0a345e7aee806 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -59,7 +59,8 @@ ChromeRenderMessageFilter::ChromeRenderMessageFilter(
profile_(profile),
off_the_record_(profile_->IsOffTheRecord()),
request_context_(request_context),
- extension_info_map_(ExtensionSystem::Get(profile)->info_map()),
+ extension_info_map_(
+ extensions::ExtensionSystem::Get(profile)->info_map()),
cookie_settings_(CookieSettings::Factory::GetForProfile(profile)),
weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
}
@@ -282,7 +283,7 @@ void ChromeRenderMessageFilter::OpenChannelToExtensionOnUIThread(
const std::string& target_extension_id,
const std::string& channel_name) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- ExtensionSystem::Get(profile_)->message_service()->
+ extensions::ExtensionSystem::Get(profile_)->message_service()->
OpenChannelToExtension(
source_process_id, source_routing_id, receiver_port_id,
source_extension_id, target_extension_id, channel_name);
@@ -308,7 +309,7 @@ void ChromeRenderMessageFilter::OpenChannelToTabOnUIThread(
const std::string& extension_id,
const std::string& channel_name) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- ExtensionSystem::Get(profile_)->message_service()->
+ extensions::ExtensionSystem::Get(profile_)->message_service()->
OpenChannelToTab(
source_process_id, source_routing_id, receiver_port_id,
tab_id, extension_id, channel_name);
@@ -422,7 +423,7 @@ void ChromeRenderMessageFilter::OnExtensionCloseChannel(int port_id,
return; // To guard against crash in browser_tests shutdown.
ExtensionMessageService* message_service =
- ExtensionSystem::Get(profile_)->message_service();
+ extensions::ExtensionSystem::Get(profile_)->message_service();
if (message_service)
message_service->CloseChannel(port_id, connection_error);
}
« no previous file with comments | « chrome/browser/profiles/profile_manager.cc ('k') | chrome/browser/speech/speech_input_extension_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698