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

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

Issue 6894020: Adds async interface method to PersistentPrefStore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: prevent multiple calls when failed Created 9 years, 7 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 profile_manager_.reset(new ProfileManager()); 838 profile_manager_.reset(new ProfileManager());
839 } 839 }
840 840
841 void BrowserProcessImpl::CreateLocalState() { 841 void BrowserProcessImpl::CreateLocalState() {
842 DCHECK(!created_local_state_ && local_state_.get() == NULL); 842 DCHECK(!created_local_state_ && local_state_.get() == NULL);
843 created_local_state_ = true; 843 created_local_state_ = true;
844 844
845 FilePath local_state_path; 845 FilePath local_state_path;
846 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); 846 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
847 local_state_.reset( 847 local_state_.reset(
848 PrefService::CreatePrefService(local_state_path, NULL, NULL)); 848 PrefService::CreatePrefService(local_state_path, NULL, NULL, false));
849 849
850 // Initialize the prefs of the local state. 850 // Initialize the prefs of the local state.
851 browser::RegisterLocalState(local_state_.get()); 851 browser::RegisterLocalState(local_state_.get());
852 852
853 pref_change_registrar_.Init(local_state_.get()); 853 pref_change_registrar_.Init(local_state_.get());
854 854
855 print_job_manager_->InitOnUIThread(local_state_.get()); 855 print_job_manager_->InitOnUIThread(local_state_.get());
856 856
857 // Initialize the notification for the default browser setting policy. 857 // Initialize the notification for the default browser setting policy.
858 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, 858 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 } 1070 }
1071 1071
1072 void BrowserProcessImpl::OnAutoupdateTimer() { 1072 void BrowserProcessImpl::OnAutoupdateTimer() {
1073 if (CanAutorestartForUpdate()) { 1073 if (CanAutorestartForUpdate()) {
1074 DLOG(WARNING) << "Detected update. Restarting browser."; 1074 DLOG(WARNING) << "Detected update. Restarting browser.";
1075 RestartPersistentInstance(); 1075 RestartPersistentInstance();
1076 } 1076 }
1077 } 1077 }
1078 1078
1079 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1079 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698