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

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

Issue 10808006: Move printing.* prefs from local state to profile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased just in case as the CL is a few days old now plus I got my branches all mixed up a bit. Created 8 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 | « no previous file | chrome/browser/chrome_content_browser_client.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); 701 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
702 local_state_.reset( 702 local_state_.reset(
703 PrefService::CreatePrefService(local_state_path, policy_service(), NULL, 703 PrefService::CreatePrefService(local_state_path, policy_service(), NULL,
704 false)); 704 false));
705 705
706 // Initialize the prefs of the local state. 706 // Initialize the prefs of the local state.
707 chrome::RegisterLocalState(local_state_.get()); 707 chrome::RegisterLocalState(local_state_.get());
708 708
709 pref_change_registrar_.Init(local_state_.get()); 709 pref_change_registrar_.Init(local_state_.get());
710 710
711 #if defined(ENABLE_PRINTING)
712 print_job_manager_->InitOnUIThread(local_state_.get());
713 #endif
714
715 // Initialize the notification for the default browser setting policy. 711 // Initialize the notification for the default browser setting policy.
716 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled, 712 local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
717 false); 713 false);
718 pref_change_registrar_.Add(prefs::kDefaultBrowserSettingEnabled, this); 714 pref_change_registrar_.Add(prefs::kDefaultBrowserSettingEnabled, this);
719 715
720 // Initialize the preference for the plugin finder policy. 716 // Initialize the preference for the plugin finder policy.
721 // This preference is only needed on the IO thread so make it available there. 717 // This preference is only needed on the IO thread so make it available there.
722 local_state_->RegisterBooleanPref(prefs::kDisablePluginFinder, false); 718 local_state_->RegisterBooleanPref(prefs::kDisablePluginFinder, false);
723 plugin_finder_disabled_pref_.reset(new BooleanPrefMember); 719 plugin_finder_disabled_pref_.reset(new BooleanPrefMember);
724 plugin_finder_disabled_pref_->Init(prefs::kDisablePluginFinder, 720 plugin_finder_disabled_pref_->Init(prefs::kDisablePluginFinder,
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 } 920 }
925 921
926 void BrowserProcessImpl::OnAutoupdateTimer() { 922 void BrowserProcessImpl::OnAutoupdateTimer() {
927 if (CanAutorestartForUpdate()) { 923 if (CanAutorestartForUpdate()) {
928 DLOG(WARNING) << "Detected update. Restarting browser."; 924 DLOG(WARNING) << "Detected update. Restarting browser.";
929 RestartBackgroundInstance(); 925 RestartBackgroundInstance();
930 } 926 }
931 } 927 }
932 928
933 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 929 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698