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

Unified Diff: chrome/browser/extensions/user_script_master.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/browser/extensions/user_script_master.cc
diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc
index f55295d73d5553aba4c57294a0c946b730bbc291..b8b662a21996afaa4fd1e7ab16a8152122f7492f 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -29,6 +29,8 @@
using content::BrowserThread;
+namespace extensions {
+
// Helper function to parse greasesmonkey headers
static bool GetDeclarationValue(const base::StringPiece& line,
const base::StringPiece& prefix,
@@ -350,8 +352,8 @@ void UserScriptMaster::Observe(int type,
break;
case chrome::NOTIFICATION_EXTENSION_LOADED: {
// Add any content scripts inside the extension.
- const extensions::Extension* extension =
- content::Details<const extensions::Extension>(details).ptr();
+ const Extension* extension =
+ content::Details<const Extension>(details).ptr();
extensions_info_[extension->id()] =
ExtensionSet::ExtensionPathAndDefaultLocale(
extension->path(), extension->default_locale());
@@ -369,9 +371,8 @@ void UserScriptMaster::Observe(int type,
}
case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
// Remove any content scripts.
- const extensions::Extension* extension =
- content::Details<extensions::UnloadedExtensionInfo>(
- details)->extension;
+ const Extension* extension =
+ content::Details<UnloadedExtensionInfo>(details)->extension;
extensions_info_.erase(extension->id());
UserScriptList new_user_scripts;
for (UserScriptList::iterator iter = user_scripts_.begin();
@@ -438,3 +439,5 @@ void UserScriptMaster::SendUpdate(content::RenderProcessHost* process,
if (base::SharedMemory::IsHandleValid(handle_for_process))
process->Send(new ExtensionMsg_UpdateUserScripts(handle_for_process));
}
+
+} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/user_script_master.h ('k') | chrome/browser/extensions/user_script_master_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698