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

Unified Diff: chrome/renderer/extensions/extension_helper.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
Index: chrome/renderer/extensions/extension_helper.cc
diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc
index 24d3dc285680c9fcd71a82259bd0aaa7f92ebebc..47a48be46d32a462a45058d8fc5041492b31b8ac 100644
--- a/chrome/renderer/extensions/extension_helper.cc
+++ b/chrome/renderer/extensions/extension_helper.cc
@@ -48,7 +48,7 @@ namespace {
// We store this mapping per process, because a frame can jump from one
// document to another with adoptNode, and so having the object be a
// RenderViewObserver means it might miss some notifications after it moves.
-typedef std::map<WebFrame*, UserScriptScheduler*> SchedulerMap;
+typedef std::map<WebFrame*, extensions::UserScriptScheduler*> SchedulerMap;
static base::LazyInstance<SchedulerMap> g_schedulers =
LAZY_INSTANCE_INITIALIZER;
@@ -225,7 +225,7 @@ bool ExtensionHelper::OnMessageReceived(const IPC::Message& message) {
void ExtensionHelper::DidFinishDocumentLoad(WebFrame* frame) {
extension_dispatcher_->user_script_slave()->InjectScripts(
- frame, UserScript::DOCUMENT_END);
+ frame, extensions::UserScript::DOCUMENT_END);
SchedulerMap::iterator i = g_schedulers.Get().find(frame);
if (i != g_schedulers.Get().end())
@@ -240,7 +240,7 @@ void ExtensionHelper::DidFinishLoad(WebKit::WebFrame* frame) {
void ExtensionHelper::DidCreateDocumentElement(WebFrame* frame) {
extension_dispatcher_->user_script_slave()->InjectScripts(
- frame, UserScript::DOCUMENT_START);
+ frame, extensions::UserScript::DOCUMENT_START);
SchedulerMap::iterator i = g_schedulers.Get().find(frame);
if (i != g_schedulers.Get().end())
i->second->DidCreateDocumentElement();
@@ -276,7 +276,7 @@ void ExtensionHelper::DidCreateDataSource(WebFrame* frame, WebDataSource* ds) {
if (g_schedulers.Get().count(frame))
return;
- g_schedulers.Get()[frame] = new UserScriptScheduler(
+ g_schedulers.Get()[frame] = new extensions::UserScriptScheduler(
frame, extension_dispatcher_);
}
« no previous file with comments | « chrome/renderer/extensions/extension_dispatcher.cc ('k') | chrome/renderer/extensions/file_system_natives.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698