summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/user_script_master.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 03:02:34 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-21 03:02:34 +0000
commit1c321ee57a522e891d91a41a09bd900f0afd6f0d (patch)
treebb6e35526d52b50d8e37216e8605c7b4aa08c86a /chrome/browser/extensions/user_script_master.cc
parente2a374f50043586ff684e0720bbbd99b9aa15c07 (diff)
downloadchromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.zip
chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.gz
chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.bz2
Move Extension into extensions namespace
BUG=117262 TBR=aa@chromium.org Review URL: https://chromiumcodereview.appspot.com/10375021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/user_script_master.cc')
-rw-r--r--chrome/browser/extensions/user_script_master.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc
index af152b4eb..a422139 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -350,8 +350,8 @@ void UserScriptMaster::Observe(int type,
break;
case chrome::NOTIFICATION_EXTENSION_LOADED: {
// Add any content scripts inside the extension.
- const Extension* extension =
- content::Details<const Extension>(details).ptr();
+ const extensions::Extension* extension =
+ content::Details<const extensions::Extension>(details).ptr();
extensions_info_[extension->id()] =
ExtensionSet::ExtensionPathAndDefaultLocale(
extension->path(), extension->default_locale());
@@ -369,8 +369,9 @@ void UserScriptMaster::Observe(int type,
}
case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
// Remove any content scripts.
- const Extension* extension =
- content::Details<UnloadedExtensionInfo>(details)->extension;
+ const extensions::Extension* extension =
+ content::Details<extensions::UnloadedExtensionInfo>(
+ details)->extension;
extensions_info_.erase(extension->id());
UserScriptList new_user_scripts;
for (UserScriptList::iterator iter = user_scripts_.begin();