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

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

Issue 8702009: Add device status reports to policy requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Mattias' comments and added unit test. Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background/background_mode_manager.h" 9 #include "chrome/browser/background/background_mode_manager.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 17 matching lines...) Expand all
28 #include "chrome/browser/metrics/metrics_service.h" 28 #include "chrome/browser/metrics/metrics_service.h"
29 #include "chrome/browser/net/http_server_properties_manager.h" 29 #include "chrome/browser/net/http_server_properties_manager.h"
30 #include "chrome/browser/net/net_pref_observer.h" 30 #include "chrome/browser/net/net_pref_observer.h"
31 #include "chrome/browser/net/predictor.h" 31 #include "chrome/browser/net/predictor.h"
32 #include "chrome/browser/net/ssl_config_service_manager.h" 32 #include "chrome/browser/net/ssl_config_service_manager.h"
33 #include "chrome/browser/notifications/desktop_notification_service.h" 33 #include "chrome/browser/notifications/desktop_notification_service.h"
34 #include "chrome/browser/notifications/notification_ui_manager.h" 34 #include "chrome/browser/notifications/notification_ui_manager.h"
35 #include "chrome/browser/page_info_model.h" 35 #include "chrome/browser/page_info_model.h"
36 #include "chrome/browser/password_manager/password_manager.h" 36 #include "chrome/browser/password_manager/password_manager.h"
37 #include "chrome/browser/policy/cloud_policy_subsystem.h" 37 #include "chrome/browser/policy/cloud_policy_subsystem.h"
38 #include "chrome/browser/policy/device_status_collector.h"
38 #include "chrome/browser/policy/url_blacklist_manager.h" 39 #include "chrome/browser/policy/url_blacklist_manager.h"
39 #include "chrome/browser/prefs/incognito_mode_prefs.h" 40 #include "chrome/browser/prefs/incognito_mode_prefs.h"
40 #include "chrome/browser/prefs/session_startup_pref.h" 41 #include "chrome/browser/prefs/session_startup_pref.h"
41 #include "chrome/browser/printing/print_job_manager.h" 42 #include "chrome/browser/printing/print_job_manager.h"
42 #include "chrome/browser/profiles/profile_impl.h" 43 #include "chrome/browser/profiles/profile_impl.h"
43 #include "chrome/browser/profiles/profile_info_cache.h" 44 #include "chrome/browser/profiles/profile_info_cache.h"
44 #include "chrome/browser/profiles/profile_manager.h" 45 #include "chrome/browser/profiles/profile_manager.h"
45 #include "chrome/browser/renderer_host/web_cache_manager.h" 46 #include "chrome/browser/renderer_host/web_cache_manager.h"
46 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 47 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
47 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 48 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 #endif 122 #endif
122 UpgradeDetector::RegisterPrefs(local_state); 123 UpgradeDetector::RegisterPrefs(local_state);
123 TaskManager::RegisterPrefs(local_state); 124 TaskManager::RegisterPrefs(local_state);
124 geolocation::RegisterPrefs(local_state); 125 geolocation::RegisterPrefs(local_state);
125 BackgroundModeManager::RegisterPrefs(local_state); 126 BackgroundModeManager::RegisterPrefs(local_state);
126 NotificationUIManager::RegisterPrefs(local_state); 127 NotificationUIManager::RegisterPrefs(local_state);
127 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); 128 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state);
128 SSLConfigServiceManager::RegisterPrefs(local_state); 129 SSLConfigServiceManager::RegisterPrefs(local_state);
129 #if defined(ENABLE_CONFIGURATION_POLICY) 130 #if defined(ENABLE_CONFIGURATION_POLICY)
130 policy::CloudPolicySubsystem::RegisterPrefs(local_state); 131 policy::CloudPolicySubsystem::RegisterPrefs(local_state);
132 policy::DeviceStatusCollector::RegisterPrefs(local_state);
131 #endif 133 #endif
132 ProfileInfoCache::RegisterPrefs(local_state); 134 ProfileInfoCache::RegisterPrefs(local_state);
133 ProfileManager::RegisterPrefs(local_state); 135 ProfileManager::RegisterPrefs(local_state);
134 #if defined(OS_CHROMEOS) 136 #if defined(OS_CHROMEOS)
135 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); 137 chromeos::AudioMixerAlsa::RegisterPrefs(local_state);
136 chromeos::UserManager::RegisterPrefs(local_state); 138 chromeos::UserManager::RegisterPrefs(local_state);
137 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); 139 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state);
138 chromeos::WizardController::RegisterPrefs(local_state); 140 chromeos::WizardController::RegisterPrefs(local_state);
139 chromeos::InputMethodMenu::RegisterPrefs(local_state); 141 chromeos::InputMethodMenu::RegisterPrefs(local_state);
140 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); 142 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 224 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
223 } 225 }
224 local_state->ClearPref(prefs::kBrowserWindowPlacement); 226 local_state->ClearPref(prefs::kBrowserWindowPlacement);
225 227
226 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 228 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
227 current_version | WINDOWS_PREFS); 229 current_version | WINDOWS_PREFS);
228 } 230 }
229 } 231 }
230 232
231 } // namespace browser 233 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698