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: Actually upload the code I intended to upload. 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
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 #include "chrome/browser/ui/webui/plugins_ui.h" 72 #include "chrome/browser/ui/webui/plugins_ui.h"
73 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 73 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
74 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 74 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
75 #include "chrome/browser/ui/window_snapshot/window_snapshot.h" 75 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
76 #include "chrome/browser/upgrade_detector.h" 76 #include "chrome/browser/upgrade_detector.h"
77 #include "chrome/browser/web_resource/promo_resource_service.h" 77 #include "chrome/browser/web_resource/promo_resource_service.h"
78 #include "chrome/common/pref_names.h" 78 #include "chrome/common/pref_names.h"
79 #include "content/public/browser/render_process_host.h" 79 #include "content/public/browser/render_process_host.h"
80 80
81 #if defined(ENABLE_CONFIGURATION_POLICY) 81 #if defined(ENABLE_CONFIGURATION_POLICY)
82 #include "chrome/browser/policy/cloud_policy_subsystem.h"
83 #include "chrome/browser/policy/policy_statistics_collector.h" 82 #include "chrome/browser/policy/policy_statistics_collector.h"
84 #include "chrome/browser/policy/url_blacklist_manager.h" 83 #include "chrome/browser/policy/url_blacklist_manager.h"
85 #endif 84 #endif
86 85
87 #if defined(OS_MACOSX) 86 #if defined(OS_MACOSX)
88 #include "chrome/browser/ui/cocoa/confirm_quit.h" 87 #include "chrome/browser/ui/cocoa/confirm_quit.h"
89 #endif 88 #endif
90 89
91 #if defined(TOOLKIT_VIEWS) 90 #if defined(TOOLKIT_VIEWS)
92 #include "chrome/browser/ui/browser_view_prefs.h" 91 #include "chrome/browser/ui/browser_view_prefs.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 166
168 #if defined(ENABLE_PLUGINS) 167 #if defined(ENABLE_PLUGINS)
169 PluginFinder::RegisterPrefs(local_state); 168 PluginFinder::RegisterPrefs(local_state);
170 #endif 169 #endif
171 170
172 #if defined(ENABLE_PLUGIN_INSTALLATION) 171 #if defined(ENABLE_PLUGIN_INSTALLATION)
173 PluginsResourceService::RegisterPrefs(local_state); 172 PluginsResourceService::RegisterPrefs(local_state);
174 #endif 173 #endif
175 174
176 #if defined(ENABLE_CONFIGURATION_POLICY) 175 #if defined(ENABLE_CONFIGURATION_POLICY)
177 policy::CloudPolicySubsystem::RegisterPrefs(local_state);
Joao da Silva 2013/01/17 09:38:05 This was registering kDevicePolicyRefreshRate and
Mattias Nissler (ping if slow) 2013/01/22 10:31:39 Done.
178 policy::PolicyStatisticsCollector::RegisterPrefs(local_state); 176 policy::PolicyStatisticsCollector::RegisterPrefs(local_state);
179 #endif 177 #endif
180 178
181 #if defined(ENABLE_NOTIFICATIONS) 179 #if defined(ENABLE_NOTIFICATIONS)
182 NotificationPrefsManager::RegisterPrefs(local_state); 180 NotificationPrefsManager::RegisterPrefs(local_state);
183 #endif 181 #endif
184 182
185 #if defined(ENABLE_TASK_MANAGER) 183 #if defined(ENABLE_TASK_MANAGER)
186 TaskManager::RegisterPrefs(local_state); 184 TaskManager::RegisterPrefs(local_state);
187 #endif // defined(ENABLE_TASK_MANAGER) 185 #endif // defined(ENABLE_TASK_MANAGER)
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 } 378 }
381 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 379 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
382 380
383 current_version |= GOOGLE_URL_TRACKER_PREFS; 381 current_version |= GOOGLE_URL_TRACKER_PREFS;
384 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 382 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
385 current_version); 383 current_version);
386 } 384 }
387 } 385 }
388 386
389 } // namespace chrome 387 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698