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

Side by Side Diff: chrome/browser/prefs/browser_prefs.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
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/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
9 #include "chrome/browser/autofill/autofill_manager.h" 9 #include "chrome/browser/autofill/autofill_manager.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 27 matching lines...) Expand all
38 #include "chrome/browser/notifications/desktop_notification_service.h" 38 #include "chrome/browser/notifications/desktop_notification_service.h"
39 #include "chrome/browser/notifications/notification_prefs_manager.h" 39 #include "chrome/browser/notifications/notification_prefs_manager.h"
40 #include "chrome/browser/page_info_model.h" 40 #include "chrome/browser/page_info_model.h"
41 #include "chrome/browser/password_manager/password_manager.h" 41 #include "chrome/browser/password_manager/password_manager.h"
42 #include "chrome/browser/pepper_flash_settings_manager.h" 42 #include "chrome/browser/pepper_flash_settings_manager.h"
43 #include "chrome/browser/policy/cloud_policy_subsystem.h" 43 #include "chrome/browser/policy/cloud_policy_subsystem.h"
44 #include "chrome/browser/policy/url_blacklist_manager.h" 44 #include "chrome/browser/policy/url_blacklist_manager.h"
45 #include "chrome/browser/prefs/incognito_mode_prefs.h" 45 #include "chrome/browser/prefs/incognito_mode_prefs.h"
46 #include "chrome/browser/prefs/pref_service.h" 46 #include "chrome/browser/prefs/pref_service.h"
47 #include "chrome/browser/prefs/session_startup_pref.h" 47 #include "chrome/browser/prefs/session_startup_pref.h"
48 #include "chrome/browser/printing/print_job_manager.h"
49 #include "chrome/browser/profiles/chrome_version_service.h" 48 #include "chrome/browser/profiles/chrome_version_service.h"
50 #include "chrome/browser/profiles/gaia_info_update_service.h" 49 #include "chrome/browser/profiles/gaia_info_update_service.h"
51 #include "chrome/browser/profiles/profile_impl.h" 50 #include "chrome/browser/profiles/profile_impl.h"
52 #include "chrome/browser/profiles/profile_info_cache.h" 51 #include "chrome/browser/profiles/profile_info_cache.h"
53 #include "chrome/browser/profiles/profile_manager.h" 52 #include "chrome/browser/profiles/profile_manager.h"
54 #include "chrome/browser/renderer_host/web_cache_manager.h" 53 #include "chrome/browser/renderer_host/web_cache_manager.h"
55 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 54 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
56 #include "chrome/browser/signin/signin_manager_factory.h" 55 #include "chrome/browser/signin/signin_manager_factory.h"
57 #include "chrome/browser/task_manager/task_manager.h" 56 #include "chrome/browser/task_manager/task_manager.h"
58 #include "chrome/browser/translate/translate_prefs.h" 57 #include "chrome/browser/translate/translate_prefs.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 PromoResourceService::RegisterPrefs(local_state); 162 PromoResourceService::RegisterPrefs(local_state);
164 #if !defined(OS_ANDROID) 163 #if !defined(OS_ANDROID)
165 AppsPromo::RegisterPrefs(local_state); 164 AppsPromo::RegisterPrefs(local_state);
166 BackgroundModeManager::RegisterPrefs(local_state); 165 BackgroundModeManager::RegisterPrefs(local_state);
167 RegisterBrowserPrefs(local_state); 166 RegisterBrowserPrefs(local_state);
168 FlagsUI::RegisterPrefs(local_state); 167 FlagsUI::RegisterPrefs(local_state);
169 ManagedMode::RegisterPrefs(local_state); 168 ManagedMode::RegisterPrefs(local_state);
170 UpgradeDetector::RegisterPrefs(local_state); 169 UpgradeDetector::RegisterPrefs(local_state);
171 #endif 170 #endif
172 171
173 #if defined(ENABLE_PRINTING)
174 printing::PrintJobManager::RegisterPrefs(local_state);
175 #endif
176
177 #if defined(OS_CHROMEOS) 172 #if defined(OS_CHROMEOS)
178 chromeos::AudioHandler::RegisterPrefs(local_state); 173 chromeos::AudioHandler::RegisterPrefs(local_state);
179 chromeos::language_prefs::RegisterPrefs(local_state); 174 chromeos::language_prefs::RegisterPrefs(local_state);
180 chromeos::DataPromoNotification::RegisterPrefs(local_state); 175 chromeos::DataPromoNotification::RegisterPrefs(local_state);
181 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); 176 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state);
182 chromeos::UserManager::RegisterPrefs(local_state); 177 chromeos::UserManager::RegisterPrefs(local_state);
183 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); 178 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
184 chromeos::signed_settings_cache::RegisterPrefs(local_state); 179 chromeos::signed_settings_cache::RegisterPrefs(local_state);
185 chromeos::WizardController::RegisterPrefs(local_state); 180 chromeos::WizardController::RegisterPrefs(local_state);
186 policy::AutoEnrollmentClient::RegisterPrefs(local_state); 181 policy::AutoEnrollmentClient::RegisterPrefs(local_state);
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 } 326 }
332 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 327 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
333 328
334 current_version |= GOOGLE_URL_TRACKER_PREFS; 329 current_version |= GOOGLE_URL_TRACKER_PREFS;
335 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 330 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
336 current_version); 331 current_version);
337 } 332 }
338 } 333 }
339 334
340 } // namespace chrome 335 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/printing/print_job_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698