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

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: fix unit_test include breakage Created 9 years, 5 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
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/chromeos/login/background_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 profile_manager_.reset(new ProfileManager()); 878 profile_manager_.reset(new ProfileManager());
879 } 879 }
880 880
881 void BrowserProcessImpl::CreateLocalState() { 881 void BrowserProcessImpl::CreateLocalState() {
882 DCHECK(!created_local_state_ && local_state_.get() == NULL); 882 DCHECK(!created_local_state_ && local_state_.get() == NULL);
883 created_local_state_ = true; 883 created_local_state_ = true;
884 884
885 FilePath local_state_path; 885 FilePath local_state_path;
886 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); 886 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
887 local_state_.reset( 887 local_state_.reset(
888 PrefService::CreatePrefService(local_state_path, NULL, NULL, false)); 888 PrefService::CreatePrefService(local_state_path, NULL, false));
889 889
890 // Initialize the prefs of the local state. 890 // Initialize the prefs of the local state.
891 browser::RegisterLocalState(local_state_.get()); 891 browser::RegisterLocalState(local_state_.get());
892 892
893 pref_change_registrar_.Init(local_state_.get()); 893 pref_change_registrar_.Init(local_state_.get());
894 894
895 print_job_manager_->InitOnUIThread(local_state_.get()); 895 print_job_manager_->InitOnUIThread(local_state_.get());
896 896
897 // Initialize the notification for the default browser setting policy. 897 // Initialize the notification for the default browser setting policy.
898 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, 898 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 } 1133 }
1134 1134
1135 void BrowserProcessImpl::OnAutoupdateTimer() { 1135 void BrowserProcessImpl::OnAutoupdateTimer() {
1136 if (CanAutorestartForUpdate()) { 1136 if (CanAutorestartForUpdate()) {
1137 DLOG(WARNING) << "Detected update. Restarting browser."; 1137 DLOG(WARNING) << "Detected update. Restarting browser.";
1138 RestartPersistentInstance(); 1138 RestartPersistentInstance();
1139 } 1139 }
1140 } 1140 }
1141 1141
1142 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1142 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/chromeos/login/background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698