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

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 5646003: Sanitize PrefStore interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix PrefService mock construction in PrefServiceTest to include command line store. Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser_process_impl.h" 5 #include "chrome/browser/browser_process_impl.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "app/clipboard/clipboard.h" 9 #include "app/clipboard/clipboard.h"
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 630
631 profile_manager_.reset(new ProfileManager()); 631 profile_manager_.reset(new ProfileManager());
632 } 632 }
633 633
634 void BrowserProcessImpl::CreateLocalState() { 634 void BrowserProcessImpl::CreateLocalState() {
635 DCHECK(!created_local_state_ && local_state_.get() == NULL); 635 DCHECK(!created_local_state_ && local_state_.get() == NULL);
636 created_local_state_ = true; 636 created_local_state_ = true;
637 637
638 FilePath local_state_path; 638 FilePath local_state_path;
639 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); 639 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
640 local_state_.reset(PrefService::CreatePrefService(local_state_path, NULL)); 640 local_state_.reset(
641 PrefService::CreatePrefService(local_state_path, NULL, NULL));
641 642
642 pref_change_registrar_.Init(local_state_.get()); 643 pref_change_registrar_.Init(local_state_.get());
643 644
644 // Make sure the the plugin updater gets notifications of changes 645 // Make sure the the plugin updater gets notifications of changes
645 // in the plugin blacklist. 646 // in the plugin blacklist.
646 local_state_->RegisterListPref(prefs::kPluginsPluginsBlacklist); 647 local_state_->RegisterListPref(prefs::kPluginsPluginsBlacklist);
647 pref_change_registrar_.Add(prefs::kPluginsPluginsBlacklist, 648 pref_change_registrar_.Add(prefs::kPluginsPluginsBlacklist,
648 PluginUpdater::GetPluginUpdater()); 649 PluginUpdater::GetPluginUpdater());
649 650
650 // Initialize and set up notifications for the printing enabled 651 // Initialize and set up notifications for the printing enabled
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 } 817 }
817 818
818 void BrowserProcessImpl::OnAutoupdateTimer() { 819 void BrowserProcessImpl::OnAutoupdateTimer() {
819 if (CanAutorestartForUpdate()) { 820 if (CanAutorestartForUpdate()) {
820 DLOG(WARNING) << "Detected update. Restarting browser."; 821 DLOG(WARNING) << "Detected update. Restarting browser.";
821 RestartPersistentInstance(); 822 RestartPersistentInstance();
822 } 823 }
823 } 824 }
824 825
825 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 826 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698