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

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

Issue 10692168: Moved ExternalExtensionLoaders/Providers into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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 f020e6db739089541e837146a8b120362ece5ef0..b0ab747d5934eb9ccefb8d9dc77df6ec568d8196 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -34,7 +34,7 @@
#include "chrome/browser/extensions/extension_toolbar_model.h"
#include "chrome/browser/extensions/extension_warning_set.h"
#include "chrome/browser/extensions/extensions_quota_service.h"
-#include "chrome/browser/extensions/external_extension_provider_interface.h"
+#include "chrome/browser/extensions/external_provider_interface.h"
#include "chrome/browser/extensions/menu_manager.h"
#include "chrome/browser/extensions/pending_extension_manager.h"
#include "chrome/browser/extensions/process_map.h"
@@ -143,7 +143,7 @@ class ExtensionServiceInterface : public syncer::SyncableService {
// Manages installed and running Chromium extensions.
class ExtensionService
: public ExtensionServiceInterface,
- public ExternalExtensionProviderInterface::VisitorInterface,
+ public extensions::ExternalProviderInterface::VisitorInterface,
public content::NotificationObserver {
public:
// The name of the directory inside the profile where extensions are
@@ -529,14 +529,15 @@ class ExtensionService
// externally managed extension. If so, uninstall it.
void CheckExternalUninstall(const std::string& id);
- // Clear all ExternalExtensionProviders.
+ // Clear all extensions::ExternalProviders.
void ClearProvidersForTesting();
- // Adds an ExternalExtensionProviderInterface for the service to use during
+ // Adds an extensions::ExternalProviderInterface for the service to use during
// testing. Takes ownership of |test_provider|.
- void AddProviderForTesting(ExternalExtensionProviderInterface* test_provider);
+ void AddProviderForTesting(
+ extensions::ExternalProviderInterface* test_provider);
- // ExternalExtensionProvider::Visitor implementation.
+ // extensions::ExternalProvider::Visitor implementation.
virtual bool OnExternalExtensionFileFound(
const std::string& id,
const Version* version,
@@ -551,7 +552,7 @@ class ExtensionService
extensions::Extension::Location location) OVERRIDE;
virtual void OnExternalProviderReady(
- const ExternalExtensionProviderInterface* provider) OVERRIDE;
+ const extensions::ExternalProviderInterface* provider) OVERRIDE;
// Returns true when all the external extension providers are ready.
bool AreAllExternalProvidersReady() const;
@@ -826,7 +827,7 @@ class ExtensionService
// A collection of external extension providers. Each provider reads
// a source of external extension information. Examples include the
// windows registry and external_extensions.json.
- ProviderCollection external_extension_providers_;
+ extensions::ProviderCollection external_extension_providers_;
// Set to true by OnExternalExtensionUpdateUrlFound() when an external
// extension URL is found, and by CheckForUpdatesSoon() when an update check

Powered by Google App Engine
This is Rietveld 408576698