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

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

Issue 195983023: Enable devices page UI on MacOSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_dcheck
Patch Set: Created 6 years, 9 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 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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 #include "components/policy/core/browser/url_blacklist_manager.h" 108 #include "components/policy/core/browser/url_blacklist_manager.h"
109 #include "components/policy/core/common/policy_statistics_collector.h" 109 #include "components/policy/core/common/policy_statistics_collector.h"
110 #endif 110 #endif
111 111
112 #if defined(ENABLE_MANAGED_USERS) 112 #if defined(ENABLE_MANAGED_USERS)
113 #include "chrome/browser/managed_mode/managed_user_service.h" 113 #include "chrome/browser/managed_mode/managed_user_service.h"
114 #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h" 114 #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
115 #include "chrome/browser/managed_mode/managed_user_sync_service.h" 115 #include "chrome/browser/managed_mode/managed_user_sync_service.h"
116 #endif 116 #endif
117 117
118 #if defined(ENABLE_MDNS) 118 #if defined(ENABLE_SERVICE_DISCOVERY)
119 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" 119 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
120 #endif 120 #endif
121 121
122 #if defined(ENABLE_PLUGIN_INSTALLATION) 122 #if defined(ENABLE_PLUGIN_INSTALLATION)
123 #include "chrome/browser/plugins/plugins_resource_service.h" 123 #include "chrome/browser/plugins/plugins_resource_service.h"
124 #endif 124 #endif
125 125
126 #if defined(OS_ANDROID) 126 #if defined(OS_ANDROID)
127 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 127 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
128 #include "chrome/browser/android/new_tab_page_prefs.h" 128 #include "chrome/browser/android/new_tab_page_prefs.h"
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 printing::StickySettings::RegisterProfilePrefs(registry); 390 printing::StickySettings::RegisterProfilePrefs(registry);
391 CloudPrintURL::RegisterProfilePrefs(registry); 391 CloudPrintURL::RegisterProfilePrefs(registry);
392 #endif 392 #endif
393 393
394 #if defined(ENABLE_MANAGED_USERS) 394 #if defined(ENABLE_MANAGED_USERS)
395 ManagedUserService::RegisterProfilePrefs(registry); 395 ManagedUserService::RegisterProfilePrefs(registry);
396 ManagedUserSharedSettingsService::RegisterProfilePrefs(registry); 396 ManagedUserSharedSettingsService::RegisterProfilePrefs(registry);
397 ManagedUserSyncService::RegisterProfilePrefs(registry); 397 ManagedUserSyncService::RegisterProfilePrefs(registry);
398 #endif 398 #endif
399 399
400 #if defined(ENABLE_MDNS) 400 #if defined(ENABLE_SERVICE_DISCOVERY)
Bernhard Bauer 2014/03/20 09:03:14 Can you move this to after ENABLE_NOTIFICATIONS, s
Noam Samuel 2014/03/20 16:50:58 Done.
401 LocalDiscoveryUI::RegisterProfilePrefs(registry); 401 LocalDiscoveryUI::RegisterProfilePrefs(registry);
402 #endif 402 #endif
403 403
404 #if defined(ENABLE_NOTIFICATIONS) 404 #if defined(ENABLE_NOTIFICATIONS)
405 DesktopNotificationService::RegisterProfilePrefs(registry); 405 DesktopNotificationService::RegisterProfilePrefs(registry);
406 #endif 406 #endif
407 407
408 #if defined(OS_ANDROID) 408 #if defined(OS_ANDROID)
409 chrome_variations::VariationsService::RegisterProfilePrefs(registry); 409 chrome_variations::VariationsService::RegisterProfilePrefs(registry);
410 NewTabPagePrefs::RegisterProfilePrefs(registry); 410 NewTabPagePrefs::RegisterProfilePrefs(registry);
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 592 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
593 current_version); 593 current_version);
594 } 594 }
595 595
596 #if defined(OS_CHROMEOS) 596 #if defined(OS_CHROMEOS)
597 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 597 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
598 #endif 598 #endif
599 } 599 }
600 600
601 } // namespace chrome 601 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698