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

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

Issue 11946017: Remove old cloud policy code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nits. Created 7 years, 11 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/policy/user_policy_token_loader.cc ('k') | chrome/browser/ui/webui/policy_ui.h » ('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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "chrome/browser/ui/webui/plugins_ui.h" 73 #include "chrome/browser/ui/webui/plugins_ui.h"
74 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 74 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
75 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 75 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
76 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" 76 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
77 #include "chrome/browser/upgrade_detector.h" 77 #include "chrome/browser/upgrade_detector.h"
78 #include "chrome/browser/web_resource/promo_resource_service.h" 78 #include "chrome/browser/web_resource/promo_resource_service.h"
79 #include "chrome/common/pref_names.h" 79 #include "chrome/common/pref_names.h"
80 #include "content/public/browser/render_process_host.h" 80 #include "content/public/browser/render_process_host.h"
81 81
82 #if defined(ENABLE_CONFIGURATION_POLICY) 82 #if defined(ENABLE_CONFIGURATION_POLICY)
83 #include "chrome/browser/policy/cloud_policy_subsystem.h" 83 #include "chrome/browser/policy/browser_policy_connector.h"
84 #include "chrome/browser/policy/policy_statistics_collector.h" 84 #include "chrome/browser/policy/policy_statistics_collector.h"
85 #include "chrome/browser/policy/url_blacklist_manager.h" 85 #include "chrome/browser/policy/url_blacklist_manager.h"
86 #endif 86 #endif
87 87
88 #if defined(OS_MACOSX) 88 #if defined(OS_MACOSX)
89 #include "chrome/browser/ui/cocoa/confirm_quit.h" 89 #include "chrome/browser/ui/cocoa/confirm_quit.h"
90 #endif 90 #endif
91 91
92 #if defined(TOOLKIT_VIEWS) 92 #if defined(TOOLKIT_VIEWS)
93 #include "chrome/browser/ui/browser_view_prefs.h" 93 #include "chrome/browser/ui/browser_view_prefs.h"
(...skipping 10 matching lines...) Expand all
104 #include "chrome/browser/chromeos/display/display_preferences.h" 104 #include "chrome/browser/chromeos/display/display_preferences.h"
105 #include "chrome/browser/chromeos/login/user_image_manager.h" 105 #include "chrome/browser/chromeos/login/user_image_manager.h"
106 #include "chrome/browser/chromeos/login/user_manager.h" 106 #include "chrome/browser/chromeos/login/user_manager.h"
107 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 107 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
108 #include "chrome/browser/chromeos/login/wizard_controller.h" 108 #include "chrome/browser/chromeos/login/wizard_controller.h"
109 #include "chrome/browser/chromeos/preferences.h" 109 #include "chrome/browser/chromeos/preferences.h"
110 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 110 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
111 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 111 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
112 #include "chrome/browser/chromeos/status/data_promo_notification.h" 112 #include "chrome/browser/chromeos/status/data_promo_notification.h"
113 #include "chrome/browser/policy/auto_enrollment_client.h" 113 #include "chrome/browser/policy/auto_enrollment_client.h"
114 #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h"
114 #include "chrome/browser/policy/device_status_collector.h" 115 #include "chrome/browser/policy/device_status_collector.h"
115 #else 116 #else
116 #include "chrome/browser/extensions/default_apps.h" 117 #include "chrome/browser/extensions/default_apps.h"
117 #endif 118 #endif
118 119
119 #if defined(USE_ASH) 120 #if defined(USE_ASH)
120 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 121 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
121 #endif 122 #endif
122 123
123 #if !defined(OS_ANDROID) 124 #if !defined(OS_ANDROID)
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 171
171 #if defined(ENABLE_PLUGINS) 172 #if defined(ENABLE_PLUGINS)
172 PluginFinder::RegisterPrefs(local_state); 173 PluginFinder::RegisterPrefs(local_state);
173 #endif 174 #endif
174 175
175 #if defined(ENABLE_PLUGIN_INSTALLATION) 176 #if defined(ENABLE_PLUGIN_INSTALLATION)
176 PluginsResourceService::RegisterPrefs(local_state); 177 PluginsResourceService::RegisterPrefs(local_state);
177 #endif 178 #endif
178 179
179 #if defined(ENABLE_CONFIGURATION_POLICY) 180 #if defined(ENABLE_CONFIGURATION_POLICY)
180 policy::CloudPolicySubsystem::RegisterPrefs(local_state); 181 policy::BrowserPolicyConnector::RegisterPrefs(local_state);
181 policy::PolicyStatisticsCollector::RegisterPrefs(local_state); 182 policy::PolicyStatisticsCollector::RegisterPrefs(local_state);
182 #endif 183 #endif
183 184
184 #if defined(ENABLE_NOTIFICATIONS) 185 #if defined(ENABLE_NOTIFICATIONS)
185 NotificationPrefsManager::RegisterPrefs(local_state); 186 NotificationPrefsManager::RegisterPrefs(local_state);
186 #endif 187 #endif
187 188
188 #if defined(ENABLE_TASK_MANAGER) 189 #if defined(ENABLE_TASK_MANAGER)
189 TaskManager::RegisterPrefs(local_state); 190 TaskManager::RegisterPrefs(local_state);
190 #endif // defined(ENABLE_TASK_MANAGER) 191 #endif // defined(ENABLE_TASK_MANAGER)
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 } 385 }
385 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 386 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
386 387
387 current_version |= GOOGLE_URL_TRACKER_PREFS; 388 current_version |= GOOGLE_URL_TRACKER_PREFS;
388 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 389 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
389 current_version); 390 current_version);
390 } 391 }
391 } 392 }
392 393
393 } // namespace chrome 394 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/policy/user_policy_token_loader.cc ('k') | chrome/browser/ui/webui/policy_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698