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

Unified Diff: chrome/browser/extensions/extension_system.cc

Issue 14319002: Change AlarmManager to use ProfileKeyedAPI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge Created 7 years, 8 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
« no previous file with comments | « chrome/browser/extensions/extension_system.h ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index 2127e00c63beabb69c888da17c575b6761df49f6..bae3630ad7d722671e1cbcc2352496c3dffc4bf3 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -12,7 +12,6 @@
#include "base/strings/string_tokenizer.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings.h"
-#include "chrome/browser/extensions/api/alarms/alarm_manager.h"
#include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
#include "chrome/browser/extensions/api/location/location_manager.h"
#include "chrome/browser/extensions/api/messaging/message_service.h"
@@ -245,10 +244,6 @@ void ExtensionSystemImpl::Shared::Shutdown() {
extension_service_->Shutdown();
}
-base::Clock* ExtensionSystemImpl::Shared::clock() {
- return &clock_;
-}
-
StateStore* ExtensionSystemImpl::Shared::state_store() {
return state_store_.get();
}
@@ -343,7 +338,6 @@ void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) {
shared_->info_map();
extension_process_manager_.reset(ExtensionProcessManager::Create(profile_));
- alarm_manager_.reset(new AlarmManager(profile_, shared_->clock()));
location_manager_ = new LocationManager(profile_);
serial_connection_manager_.reset(new ApiResourceManager<SerialConnection>(
@@ -385,9 +379,6 @@ ExtensionProcessManager* ExtensionSystemImpl::process_manager() {
return extension_process_manager_.get();
}
-AlarmManager* ExtensionSystemImpl::alarm_manager() {
- return alarm_manager_.get();
-}
LocationManager* ExtensionSystemImpl::location_manager() {
return location_manager_.get();
« no previous file with comments | « chrome/browser/extensions/extension_system.h ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698