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

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

Issue 7147015: Move user cloud policy to BrowserProcess (was 6979011) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cut a circular startup dependency Created 9 years, 6 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 869 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 profile_manager_.reset(new ProfileManager()); 880 profile_manager_.reset(new ProfileManager());
881 } 881 }
882 882
883 void BrowserProcessImpl::CreateLocalState() { 883 void BrowserProcessImpl::CreateLocalState() {
884 DCHECK(!created_local_state_ && local_state_.get() == NULL); 884 DCHECK(!created_local_state_ && local_state_.get() == NULL);
885 created_local_state_ = true; 885 created_local_state_ = true;
886 886
887 FilePath local_state_path; 887 FilePath local_state_path;
888 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); 888 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
889 local_state_.reset( 889 local_state_.reset(
890 PrefService::CreatePrefService(local_state_path, NULL, NULL, false)); 890 PrefService::CreatePrefService(local_state_path, NULL, false));
891 891
892 // Initialize the prefs of the local state. 892 // Initialize the prefs of the local state.
893 browser::RegisterLocalState(local_state_.get()); 893 browser::RegisterLocalState(local_state_.get());
894 894
895 pref_change_registrar_.Init(local_state_.get()); 895 pref_change_registrar_.Init(local_state_.get());
896 896
897 print_job_manager_->InitOnUIThread(local_state_.get()); 897 print_job_manager_->InitOnUIThread(local_state_.get());
898 898
899 // Initialize the notification for the default browser setting policy. 899 // Initialize the notification for the default browser setting policy.
900 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, 900 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 } 1135 }
1136 1136
1137 void BrowserProcessImpl::OnAutoupdateTimer() { 1137 void BrowserProcessImpl::OnAutoupdateTimer() {
1138 if (CanAutorestartForUpdate()) { 1138 if (CanAutorestartForUpdate()) {
1139 DLOG(WARNING) << "Detected update. Restarting browser."; 1139 DLOG(WARNING) << "Detected update. Restarting browser.";
1140 RestartPersistentInstance(); 1140 RestartPersistentInstance();
1141 } 1141 }
1142 } 1142 }
1143 1143
1144 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1144 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698