| 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 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 874 profile_manager_.reset(new ProfileManager()); | 874 profile_manager_.reset(new ProfileManager()); |
| 875 } | 875 } |
| 876 | 876 |
| 877 void BrowserProcessImpl::CreateLocalState() { | 877 void BrowserProcessImpl::CreateLocalState() { |
| 878 DCHECK(!created_local_state_ && local_state_.get() == NULL); | 878 DCHECK(!created_local_state_ && local_state_.get() == NULL); |
| 879 created_local_state_ = true; | 879 created_local_state_ = true; |
| 880 | 880 |
| 881 FilePath local_state_path; | 881 FilePath local_state_path; |
| 882 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); | 882 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); |
| 883 local_state_.reset( | 883 local_state_.reset( |
| 884 PrefService::CreatePrefService(local_state_path, NULL, NULL, false)); | 884 PrefService::CreatePrefService(local_state_path, NULL, false)); |
| 885 | 885 |
| 886 // Initialize the prefs of the local state. | 886 // Initialize the prefs of the local state. |
| 887 browser::RegisterLocalState(local_state_.get()); | 887 browser::RegisterLocalState(local_state_.get()); |
| 888 | 888 |
| 889 pref_change_registrar_.Init(local_state_.get()); | 889 pref_change_registrar_.Init(local_state_.get()); |
| 890 | 890 |
| 891 print_job_manager_->InitOnUIThread(local_state_.get()); | 891 print_job_manager_->InitOnUIThread(local_state_.get()); |
| 892 | 892 |
| 893 // Initialize the notification for the default browser setting policy. | 893 // Initialize the notification for the default browser setting policy. |
| 894 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, | 894 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1137 } | 1137 } |
| 1138 | 1138 |
| 1139 void BrowserProcessImpl::OnAutoupdateTimer() { | 1139 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1140 if (CanAutorestartForUpdate()) { | 1140 if (CanAutorestartForUpdate()) { |
| 1141 DLOG(WARNING) << "Detected update. Restarting browser."; | 1141 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1142 RestartPersistentInstance(); | 1142 RestartPersistentInstance(); |
| 1143 } | 1143 } |
| 1144 } | 1144 } |
| 1145 | 1145 |
| 1146 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1146 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |