| OLD | NEW |
| 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 882 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 893 profile_manager_.reset(new ProfileManager()); | 893 profile_manager_.reset(new ProfileManager()); |
| 894 } | 894 } |
| 895 | 895 |
| 896 void BrowserProcessImpl::CreateLocalState() { | 896 void BrowserProcessImpl::CreateLocalState() { |
| 897 DCHECK(!created_local_state_ && local_state_.get() == NULL); | 897 DCHECK(!created_local_state_ && local_state_.get() == NULL); |
| 898 created_local_state_ = true; | 898 created_local_state_ = true; |
| 899 | 899 |
| 900 FilePath local_state_path; | 900 FilePath local_state_path; |
| 901 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); | 901 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); |
| 902 local_state_.reset( | 902 local_state_.reset( |
| 903 PrefService::CreatePrefService(local_state_path, NULL, NULL, false)); | 903 PrefService::CreatePrefService(local_state_path, NULL, false)); |
| 904 | 904 |
| 905 // Initialize the prefs of the local state. | 905 // Initialize the prefs of the local state. |
| 906 browser::RegisterLocalState(local_state_.get()); | 906 browser::RegisterLocalState(local_state_.get()); |
| 907 | 907 |
| 908 pref_change_registrar_.Init(local_state_.get()); | 908 pref_change_registrar_.Init(local_state_.get()); |
| 909 | 909 |
| 910 print_job_manager_->InitOnUIThread(local_state_.get()); | 910 print_job_manager_->InitOnUIThread(local_state_.get()); |
| 911 | 911 |
| 912 // Initialize the notification for the default browser setting policy. | 912 // Initialize the notification for the default browser setting policy. |
| 913 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, | 913 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1149 } | 1149 } |
| 1150 | 1150 |
| 1151 void BrowserProcessImpl::OnAutoupdateTimer() { | 1151 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1152 if (CanAutorestartForUpdate()) { | 1152 if (CanAutorestartForUpdate()) { |
| 1153 DLOG(WARNING) << "Detected update. Restarting browser."; | 1153 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1154 RestartPersistentInstance(); | 1154 RestartPersistentInstance(); |
| 1155 } | 1155 } |
| 1156 } | 1156 } |
| 1157 | 1157 |
| 1158 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1158 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |