1 files changed, 12 insertions, 10 deletions

diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
index c5acf80..e8d9114 100644
--- a/chrome/browser/extensions/crx_installer.h
+++ b/chrome/browser/extensions/crx_installer.h
@@ -90,8 +90,10 @@ class CrxInstaller
 
   const FilePath& source_file() const { return source_file_; }
 
-  Extension::Location install_source() const { return install_source_; }
-  void set_install_source(Extension::Location source) {
+  extensions::Extension::Location install_source() const {
+    return install_source_;
+  }
+  void set_install_source(extensions::Extension::Location source) {
     install_source_ = source;
   }
 
@@ -109,13 +111,13 @@ class CrxInstaller
   void set_allow_silent_install(bool val) { allow_silent_install_ = val; }
 
   bool is_gallery_install() const {
-    return (creation_flags_ & Extension::FROM_WEBSTORE) > 0;
+    return (creation_flags_ & extensions::Extension::FROM_WEBSTORE) > 0;
   }
   void set_is_gallery_install(bool val) {
     if (val)
-      creation_flags_ |= Extension::FROM_WEBSTORE;
+      creation_flags_ |= extensions::Extension::FROM_WEBSTORE;
     else
-      creation_flags_ &= ~Extension::FROM_WEBSTORE;
+      creation_flags_ &= ~extensions::Extension::FROM_WEBSTORE;
   }
 
   // The original download URL should be set when the WebstoreInstaller is
@@ -167,14 +169,14 @@ class CrxInstaller
 
   // Called after OnUnpackSuccess as a last check to see whether the install
   // should complete.
-  bool AllowInstall(const Extension* extension, string16* error);
+  bool AllowInstall(const extensions::Extension* extension, string16* error);
 
   // SandboxedExtensionUnpackerClient
   virtual void OnUnpackFailure(const string16& error_message) OVERRIDE;
   virtual void OnUnpackSuccess(const FilePath& temp_dir,
                                const FilePath& extension_dir,
                                const base::DictionaryValue* original_manifest,
-                               const Extension* extension) OVERRIDE;
+                               const extensions::Extension* extension) OVERRIDE;
 
   // Returns true if we can skip confirmation because the install was
   // whitelisted.
@@ -193,7 +195,7 @@ class CrxInstaller
   void ReportFailureFromUIThread(const string16& error);
   void ReportSuccessFromFileThread();
   void ReportSuccessFromUIThread();
-  void NotifyCrxInstallComplete(const Extension* extension);
+  void NotifyCrxInstallComplete(const extensions::Extension* extension);
 
   // The file we're installing.
   FilePath source_file_;
@@ -207,7 +209,7 @@ class CrxInstaller
   // The location the installation came from (bundled with Chromium, registry,
   // manual install, etc). This metadata is saved with the installation if
   // successful. Defaults to INTERNAL.
-  Extension::Location install_source_;
+  extensions::Extension::Location install_source_;
 
   // Indicates whether the user has already approved the extension to be
   // installed. If true, |expected_manifest_| and |expected_id_| must match
@@ -248,7 +250,7 @@ class CrxInstaller
 
   // The extension we're installing. We own this and either pass it off to
   // ExtensionService on success, or delete it on failure.
-  scoped_refptr<const Extension> extension_;
+  scoped_refptr<const extensions::Extension> extension_;
 
   // The ordinal of the NTP apps page |extension_| will be shown on.
   StringOrdinal page_ordinal_;