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

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: 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
Index: chrome/renderer/extensions/extension_dispatcher.cc
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index 63c893ff2f7d5a5ee7d8722af90e5a6aa473a7e2..031c77aa3f2eb4fd94d3c6a9544a1c8a2ee5d041 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -278,7 +278,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();
@@ -694,7 +694,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);
@@ -793,7 +793,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));
}
@@ -1065,7 +1065,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;

Powered by Google App Engine
This is Rietveld 408576698