| Index: chrome/browser/extensions/extension_service.h
|
| diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
|
| index 68c1b34dff3705431dcd3549b3a55507e6de2527..24c3d1c18387ce7d7f377aee41e7b572e077a74b 100644
|
| --- a/chrome/browser/extensions/extension_service.h
|
| +++ b/chrome/browser/extensions/extension_service.h
|
| @@ -48,7 +48,6 @@
|
|
|
| class AppNotificationManager;
|
| class BookmarkExtensionEventRouter;
|
| -class CrxInstaller;
|
| class ExtensionErrorUI;
|
| class ExtensionFontSettingsEventRouter;
|
| class ExtensionManagementEventRouter;
|
| @@ -71,6 +70,7 @@ class AppSyncData;
|
| class BrowserEventRouter;
|
| class ComponentLoader;
|
| class ContentSettingsStore;
|
| +class CrxInstaller;
|
| class Extension;
|
| class ExtensionCookiesEventRouter;
|
| class ExtensionManagedModeEventRouter;
|
| @@ -87,6 +87,11 @@ 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 {
|
| @@ -107,7 +112,7 @@ class ExtensionServiceInterface : public syncer::SyncableService {
|
| const std::string& id,
|
| const FilePath& path,
|
| const GURL& download_url,
|
| - CrxInstaller** out_crx_installer) = 0;
|
| + extensions::CrxInstaller** out_crx_installer) = 0;
|
| virtual const extensions::Extension* GetExtensionById(const std::string& id,
|
| bool include_disabled) const = 0;
|
| virtual const extensions::Extension* GetInstalledExtension(
|
| @@ -313,7 +318,7 @@ class ExtensionService
|
| const std::string& id,
|
| const FilePath& extension_path,
|
| const GURL& download_url,
|
| - CrxInstaller** out_crx_installer) OVERRIDE;
|
| + extensions::CrxInstaller** out_crx_installer) OVERRIDE;
|
|
|
| // Reloads the specified extension.
|
| void ReloadExtension(const std::string& extension_id);
|
|
|