| Index: chrome/browser/extensions/extension_system.h
|
| diff --git a/chrome/browser/extensions/extension_system.h b/chrome/browser/extensions/extension_system.h
|
| index d5d38c89e0e50f6be5245d952f5b00058d485afb..06ece2c33132e693d531379785c45c858c5d7aac 100644
|
| --- a/chrome/browser/extensions/extension_system.h
|
| +++ b/chrome/browser/extensions/extension_system.h
|
| @@ -9,7 +9,6 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "base/time/default_clock.h"
|
| #include "chrome/browser/extensions/api/api_resource_manager.h"
|
| #include "chrome/browser/extensions/api/serial/serial_connection.h"
|
| #include "chrome/browser/extensions/api/socket/socket.h"
|
| @@ -82,9 +81,6 @@ class ExtensionSystem : public ProfileKeyedService {
|
| // The ExtensionProcessManager is created at startup.
|
| virtual ExtensionProcessManager* process_manager() = 0;
|
|
|
| - // The AlarmManager is created at startup.
|
| - virtual AlarmManager* alarm_manager() = 0;
|
| -
|
| // The LocationManager is created at startup.
|
| virtual LocationManager* location_manager() = 0;
|
|
|
| @@ -169,7 +165,6 @@ class ExtensionSystemImpl : public ExtensionSystem {
|
| virtual ManagementPolicy* management_policy() OVERRIDE; // shared
|
| virtual UserScriptMaster* user_script_master() OVERRIDE; // shared
|
| virtual ExtensionProcessManager* process_manager() OVERRIDE;
|
| - virtual AlarmManager* alarm_manager() OVERRIDE;
|
| virtual LocationManager* location_manager() OVERRIDE;
|
| virtual StateStore* state_store() OVERRIDE; // shared
|
| virtual StateStore* rules_store() OVERRIDE; // shared
|
| @@ -217,7 +212,6 @@ class ExtensionSystemImpl : public ExtensionSystem {
|
| // ProfileKeyedService implementation.
|
| virtual void Shutdown() OVERRIDE;
|
|
|
| - base::Clock* clock();
|
| StateStore* state_store();
|
| StateStore* rules_store();
|
| ExtensionPrefs* extension_prefs();
|
| @@ -237,7 +231,6 @@ class ExtensionSystemImpl : public ExtensionSystem {
|
|
|
| // The services that are shared between normal and incognito profiles.
|
|
|
| - base::DefaultClock clock_;
|
| scoped_ptr<StateStore> state_store_;
|
| scoped_ptr<StateStore> rules_store_;
|
| scoped_ptr<ExtensionPrefs> extension_prefs_;
|
| @@ -273,7 +266,6 @@ class ExtensionSystemImpl : public ExtensionSystem {
|
| // incoming resource requests from extension processes and those require
|
| // access to the ResourceContext owned by |io_data_|.
|
| scoped_ptr<ExtensionProcessManager> extension_process_manager_;
|
| - scoped_ptr<AlarmManager> alarm_manager_;
|
| scoped_refptr<LocationManager> location_manager_;
|
| scoped_ptr<ApiResourceManager<SerialConnection> > serial_connection_manager_;
|
| scoped_ptr<ApiResourceManager<Socket> > socket_manager_;
|
|
|