Move PendingExtensionManager and PendingExtensionInfo into extensions namespace
BUG=134744, 117261
Review URL: https://chromiumcodereview.appspot.com/10682007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148654 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 24c3d1c18..7e082c88 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -56,7 +56,6 @@
class ExtensionToolbarModel;
class HistoryExtensionEventRouter;
class GURL;
-class PendingExtensionManager;
class Profile;
class Version;
@@ -77,6 +76,7 @@
class ExtensionSyncData;
class ExtensionSystem;
class ExtensionUpdater;
+class PendingExtensionManager;
class SettingsFrontend;
class WebNavigationEventRouter;
class WindowEventRouter;
@@ -87,11 +87,6 @@
class SyncErrorFactory;
}
-namespace syncer {
-class SyncData;
-class SyncErrorFactory;
-}
-
// This is an interface class to encapsulate the dependencies that
// various classes have on ExtensionService. This allows easy mocking.
class ExtensionServiceInterface : public syncer::SyncableService {
@@ -104,7 +99,7 @@
virtual ~ExtensionServiceInterface() {}
virtual const ExtensionSet* extensions() const = 0;
virtual const ExtensionSet* disabled_extensions() const = 0;
- virtual PendingExtensionManager* pending_extension_manager() = 0;
+ virtual extensions::PendingExtensionManager* pending_extension_manager() = 0;
// Install an update. Return true if the install can be started.
// Set out_crx_installer to the installer if one was started.
@@ -218,7 +213,8 @@
const ExtensionSet* GenerateInstalledExtensionsSet() const;
// Gets the object managing the set of pending extensions.
- virtual PendingExtensionManager* pending_extension_manager() OVERRIDE;
+ virtual extensions::PendingExtensionManager*
+ pending_extension_manager() OVERRIDE;
const FilePath& install_directory() const { return install_directory_; }
@@ -732,7 +728,7 @@
ExtensionSet terminated_extensions_;
// Hold the set of pending extensions.
- PendingExtensionManager pending_extension_manager_;
+ extensions::PendingExtensionManager pending_extension_manager_;
// The map of extension IDs to their runtime data.
ExtensionRuntimeDataMap extension_runtime_data_;
