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

Side by Side Diff: chrome/browser/extensions/extension_system.cc

Issue 12314056: Make chrome/browser/extensions use base::Clock instead of MockTimeProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add include Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/extension_system.h" 5 #include "chrome/browser/extensions/extension_system.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 229
230 void ExtensionSystemImpl::Shared::Shutdown() { 230 void ExtensionSystemImpl::Shared::Shutdown() {
231 if (extension_warning_service_.get()) { 231 if (extension_warning_service_.get()) {
232 extension_warning_service_->RemoveObserver( 232 extension_warning_service_->RemoveObserver(
233 extension_warning_badge_service_.get()); 233 extension_warning_badge_service_.get());
234 } 234 }
235 if (extension_service_.get()) 235 if (extension_service_.get())
236 extension_service_->Shutdown(); 236 extension_service_->Shutdown();
237 } 237 }
238 238
239 base::Clock* ExtensionSystemImpl::Shared::clock() {
240 return &clock_;
241 }
242
239 StateStore* ExtensionSystemImpl::Shared::state_store() { 243 StateStore* ExtensionSystemImpl::Shared::state_store() {
240 return state_store_.get(); 244 return state_store_.get();
241 } 245 }
242 246
243 StateStore* ExtensionSystemImpl::Shared::rules_store() { 247 StateStore* ExtensionSystemImpl::Shared::rules_store() {
244 return rules_store_.get(); 248 return rules_store_.get();
245 } 249 }
246 250
247 ExtensionPrefs* ExtensionSystemImpl::Shared::extension_prefs() { 251 ExtensionPrefs* ExtensionSystemImpl::Shared::extension_prefs() {
248 return extension_prefs_.get(); 252 return extension_prefs_.get();
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) { 323 void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) {
320 DCHECK(!profile_->IsOffTheRecord()); 324 DCHECK(!profile_->IsOffTheRecord());
321 if (user_script_master() || extension_service()) 325 if (user_script_master() || extension_service())
322 return; // Already initialized. 326 return; // Already initialized.
323 327
324 // The ExtensionInfoMap needs to be created before the 328 // The ExtensionInfoMap needs to be created before the
325 // ExtensionProcessManager. 329 // ExtensionProcessManager.
326 shared_->info_map(); 330 shared_->info_map();
327 331
328 extension_process_manager_.reset(ExtensionProcessManager::Create(profile_)); 332 extension_process_manager_.reset(ExtensionProcessManager::Create(profile_));
329 alarm_manager_.reset(new AlarmManager(profile_, &base::Time::Now)); 333 alarm_manager_.reset(new AlarmManager(profile_, shared_->clock()));
330 334
331 serial_connection_manager_.reset(new ApiResourceManager<SerialConnection>( 335 serial_connection_manager_.reset(new ApiResourceManager<SerialConnection>(
332 BrowserThread::FILE)); 336 BrowserThread::FILE));
333 socket_manager_.reset(new ApiResourceManager<Socket>(BrowserThread::IO)); 337 socket_manager_.reset(new ApiResourceManager<Socket>(BrowserThread::IO));
334 usb_device_resource_manager_.reset( 338 usb_device_resource_manager_.reset(
335 new ApiResourceManager<UsbDeviceResource>(BrowserThread::IO)); 339 new ApiResourceManager<UsbDeviceResource>(BrowserThread::IO));
336 340
337 rules_registry_service_.reset(new RulesRegistryService(profile_)); 341 rules_registry_service_.reset(new RulesRegistryService(profile_));
338 rules_registry_service_->RegisterDefaultRulesRegistries(); 342 rules_registry_service_->RegisterDefaultRulesRegistries();
339 343
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts( 452 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
449 const std::string& extension_id, 453 const std::string& extension_id,
450 const extension_misc::UnloadedExtensionReason reason) { 454 const extension_misc::UnloadedExtensionReason reason) {
451 BrowserThread::PostTask( 455 BrowserThread::PostTask(
452 BrowserThread::IO, FROM_HERE, 456 BrowserThread::IO, FROM_HERE,
453 base::Bind(&ExtensionInfoMap::RemoveExtension, info_map(), 457 base::Bind(&ExtensionInfoMap::RemoveExtension, info_map(),
454 extension_id, reason)); 458 extension_id, reason));
455 } 459 }
456 460
457 } // namespace extensions 461 } // namespace extensions
OLDNEW
« 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