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

Unified Diff: chrome/browser/extensions/extension_service.h

Issue 10682007: Move PendingExtensionManager and PendingExtensionInfo 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/extension_service.h
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 24c3d1c18387ce7d7f377aee41e7b572e077a74b..7e082c88fd58c0b983d6bea6cd99463c1ac4e842 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -56,7 +56,6 @@ class ExtensionSyncData;
class ExtensionToolbarModel;
class HistoryExtensionEventRouter;
class GURL;
-class PendingExtensionManager;
class Profile;
class Version;
@@ -77,6 +76,7 @@ class ExtensionManagedModeEventRouter;
class ExtensionSyncData;
class ExtensionSystem;
class ExtensionUpdater;
+class PendingExtensionManager;
class SettingsFrontend;
class WebNavigationEventRouter;
class WindowEventRouter;
@@ -87,11 +87,6 @@ class SyncData;
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 @@ class ExtensionServiceInterface : public syncer::SyncableService {
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 @@ class ExtensionService
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 @@ class ExtensionService
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_;
« no previous file with comments | « chrome/browser/extensions/extension_management_browsertest.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698