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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 10692110: screenshot disabling policy (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Addressed comments 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
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "chrome/browser/signin/signin_manager_factory.h" 56 #include "chrome/browser/signin/signin_manager_factory.h"
57 #include "chrome/browser/task_manager/task_manager.h" 57 #include "chrome/browser/task_manager/task_manager.h"
58 #include "chrome/browser/translate/translate_prefs.h" 58 #include "chrome/browser/translate/translate_prefs.h"
59 #include "chrome/browser/ui/alternate_error_tab_observer.h" 59 #include "chrome/browser/ui/alternate_error_tab_observer.h"
60 #include "chrome/browser/ui/browser_ui_prefs.h" 60 #include "chrome/browser/ui/browser_ui_prefs.h"
61 #include "chrome/browser/ui/network_profile_bubble.h" 61 #include "chrome/browser/ui/network_profile_bubble.h"
62 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 62 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
63 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 63 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
64 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 64 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
65 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 65 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
66 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
66 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 67 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
67 #include "chrome/browser/ui/webui/flags_ui.h" 68 #include "chrome/browser/ui/webui/flags_ui.h"
68 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 69 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
69 #include "chrome/browser/ui/webui/plugins_ui.h" 70 #include "chrome/browser/ui/webui/plugins_ui.h"
70 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 71 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
71 #include "chrome/browser/upgrade_detector.h" 72 #include "chrome/browser/upgrade_detector.h"
72 #include "chrome/browser/web_resource/promo_resource_service.h" 73 #include "chrome/browser/web_resource/promo_resource_service.h"
73 #include "chrome/common/pref_names.h" 74 #include "chrome/common/pref_names.h"
74 #include "content/public/browser/render_process_host.h" 75 #include "content/public/browser/render_process_host.h"
75 76
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 chromeos::AudioHandler::RegisterPrefs(local_state); 164 chromeos::AudioHandler::RegisterPrefs(local_state);
164 chromeos::language_prefs::RegisterPrefs(local_state); 165 chromeos::language_prefs::RegisterPrefs(local_state);
165 chromeos::DataPromoNotification::RegisterPrefs(local_state); 166 chromeos::DataPromoNotification::RegisterPrefs(local_state);
166 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); 167 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state);
167 chromeos::UserManager::RegisterPrefs(local_state); 168 chromeos::UserManager::RegisterPrefs(local_state);
168 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); 169 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
169 chromeos::signed_settings_cache::RegisterPrefs(local_state); 170 chromeos::signed_settings_cache::RegisterPrefs(local_state);
170 chromeos::WizardController::RegisterPrefs(local_state); 171 chromeos::WizardController::RegisterPrefs(local_state);
171 policy::AutoEnrollmentClient::RegisterPrefs(local_state); 172 policy::AutoEnrollmentClient::RegisterPrefs(local_state);
172 policy::DeviceStatusCollector::RegisterPrefs(local_state); 173 policy::DeviceStatusCollector::RegisterPrefs(local_state);
174 ChromeShellDelegate::RegisterLocalPrefs(local_state);
173 #endif 175 #endif
174 176
175 #if defined(OS_MACOSX) 177 #if defined(OS_MACOSX)
176 chrome::RegisterObsoleteOSInfobarPrefs(local_state); 178 chrome::RegisterObsoleteOSInfobarPrefs(local_state);
177 confirm_quit::RegisterLocalState(local_state); 179 confirm_quit::RegisterLocalState(local_state);
178 #endif 180 #endif
179 } 181 }
180 182
181 void RegisterUserPrefs(PrefService* user_prefs) { 183 void RegisterUserPrefs(PrefService* user_prefs) {
182 // User prefs 184 // User prefs
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 SyncPromoUI::RegisterUserPrefs(user_prefs); 241 SyncPromoUI::RegisterUserPrefs(user_prefs);
240 #endif 242 #endif
241 243
242 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 244 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
243 default_apps::RegisterUserPrefs(user_prefs); 245 default_apps::RegisterUserPrefs(user_prefs);
244 #endif 246 #endif
245 247
246 #if defined(OS_CHROMEOS) 248 #if defined(OS_CHROMEOS)
247 chromeos::Preferences::RegisterUserPrefs(user_prefs); 249 chromeos::Preferences::RegisterUserPrefs(user_prefs);
248 chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs); 250 chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs);
251 ChromeShellDelegate::RegisterUserPrefs(user_prefs);
Mattias Nissler (ping if slow) 2012/07/09 09:30:12 I think making this OS_CHROMEOS only will break, b
qfel 2012/07/11 12:34:49 Updated to make profile pref always present, and l
249 #endif 252 #endif
250 253
251 #if defined(OS_MACOSX) 254 #if defined(OS_MACOSX)
252 PresentationModePrefs::RegisterUserPrefs(user_prefs); 255 PresentationModePrefs::RegisterUserPrefs(user_prefs);
253 #endif 256 #endif
254 257
255 #if defined(OS_WIN) 258 #if defined(OS_WIN)
256 NetworkProfileBubble::RegisterPrefs(user_prefs); 259 NetworkProfileBubble::RegisterPrefs(user_prefs);
257 #endif 260 #endif
258 } 261 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 } 321 }
319 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 322 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
320 323
321 current_version |= GOOGLE_URL_TRACKER_PREFS; 324 current_version |= GOOGLE_URL_TRACKER_PREFS;
322 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 325 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
323 current_version); 326 current_version);
324 } 327 }
325 } 328 }
326 329
327 } // namespace browser 330 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698