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

Unified Diff: chrome/renderer/extensions/extension_dispatcher.cc

Issue 10696176: Move UserScript and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest master for cq 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/renderer/extensions/extension_dispatcher.h ('k') | chrome/renderer/extensions/extension_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/extension_dispatcher.cc
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index e1e84d9950d1bf5794c40ad0652f2a4fc67ae1c1..f6618d0ab678307547438a864e97d85548bd16d2 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -277,7 +277,7 @@ ExtensionDispatcher::ExtensionDispatcher()
kInitialExtensionIdleHandlerDelayMs);
}
- user_script_slave_.reset(new UserScriptSlave(&extensions_));
+ user_script_slave_.reset(new extensions::UserScriptSlave(&extensions_));
request_sender_.reset(new ExtensionRequestSender(this, &v8_context_set_));
PopulateSourceMap();
PopulateLazyBindingsMap();
@@ -693,7 +693,7 @@ void ExtensionDispatcher::DidCreateScriptContext(
}
ExtensionURLInfo url_info(frame->document().securityOrigin(),
- UserScriptSlave::GetDataSourceURLForFrame(frame));
+ extensions::UserScriptSlave::GetDataSourceURLForFrame(frame));
Feature::Context context_type =
ClassifyJavaScriptContext(extension_id, extension_group, url_info);
@@ -792,7 +792,7 @@ std::string ExtensionDispatcher::GetExtensionID(const WebFrame* frame,
}
// Extension pages (chrome-extension:// URLs).
- GURL frame_url = UserScriptSlave::GetDataSourceURLForFrame(frame);
+ GURL frame_url = extensions::UserScriptSlave::GetDataSourceURLForFrame(frame);
return extensions_.GetExtensionOrAppIDByURL(
ExtensionURLInfo(frame->document().securityOrigin(), frame_url));
}
@@ -1064,7 +1064,7 @@ bool ExtensionDispatcher::CheckCurrentContextAccessToExtensionAPI(
// we should abort.
WebKit::WebFrame* frame = context->web_frame();
ExtensionURLInfo url_info(frame->document().securityOrigin(),
- UserScriptSlave::GetDataSourceURLForFrame(frame));
+ extensions::UserScriptSlave::GetDataSourceURLForFrame(frame));
CHECK(!extensions_.IsSandboxedPage(url_info));
return true;
« no previous file with comments | « chrome/renderer/extensions/extension_dispatcher.h ('k') | chrome/renderer/extensions/extension_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698