| 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 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| (...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 826 profile_manager_.reset(new ProfileManager()); | 826 profile_manager_.reset(new ProfileManager()); |
| 827 } | 827 } |
| 828 | 828 |
| 829 void BrowserProcessImpl::CreateLocalState() { | 829 void BrowserProcessImpl::CreateLocalState() { |
| 830 DCHECK(!created_local_state_ && local_state_.get() == NULL); | 830 DCHECK(!created_local_state_ && local_state_.get() == NULL); |
| 831 created_local_state_ = true; | 831 created_local_state_ = true; |
| 832 | 832 |
| 833 FilePath local_state_path; | 833 FilePath local_state_path; |
| 834 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); | 834 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); |
| 835 local_state_.reset( | 835 local_state_.reset( |
| 836 PrefService::CreatePrefService(local_state_path, NULL, NULL)); | 836 PrefService::CreatePrefService(local_state_path, NULL, NULL, false)); |
| 837 | 837 |
| 838 pref_change_registrar_.Init(local_state_.get()); | 838 pref_change_registrar_.Init(local_state_.get()); |
| 839 | 839 |
| 840 // Make sure the the plugin updater gets notifications of changes | 840 // Make sure the the plugin updater gets notifications of changes |
| 841 // in the plugin policy lists. | 841 // in the plugin policy lists. |
| 842 local_state_->RegisterListPref(prefs::kPluginsDisabledPlugins); | 842 local_state_->RegisterListPref(prefs::kPluginsDisabledPlugins); |
| 843 pref_change_registrar_.Add(prefs::kPluginsDisabledPlugins, | 843 pref_change_registrar_.Add(prefs::kPluginsDisabledPlugins, |
| 844 PluginUpdater::GetInstance()); | 844 PluginUpdater::GetInstance()); |
| 845 local_state_->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions); | 845 local_state_->RegisterListPref(prefs::kPluginsDisabledPluginsExceptions); |
| 846 pref_change_registrar_.Add(prefs::kPluginsDisabledPluginsExceptions, | 846 pref_change_registrar_.Add(prefs::kPluginsDisabledPluginsExceptions, |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1065 } | 1065 } |
| 1066 | 1066 |
| 1067 void BrowserProcessImpl::OnAutoupdateTimer() { | 1067 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1068 if (CanAutorestartForUpdate()) { | 1068 if (CanAutorestartForUpdate()) { |
| 1069 DLOG(WARNING) << "Detected update. Restarting browser."; | 1069 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1070 RestartPersistentInstance(); | 1070 RestartPersistentInstance(); |
| 1071 } | 1071 } |
| 1072 } | 1072 } |
| 1073 | 1073 |
| 1074 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1074 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |