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

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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 #include "components/policy/core/browser/url_blacklist_manager.h" 109 #include "components/policy/core/browser/url_blacklist_manager.h"
110 #include "components/policy/core/common/policy_statistics_collector.h" 110 #include "components/policy/core/common/policy_statistics_collector.h"
111 #endif 111 #endif
112 112
113 #if defined(ENABLE_MANAGED_USERS) 113 #if defined(ENABLE_MANAGED_USERS)
114 #include "chrome/browser/managed_mode/managed_user_service.h" 114 #include "chrome/browser/managed_mode/managed_user_service.h"
115 #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h" 115 #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
116 #include "chrome/browser/managed_mode/managed_user_sync_service.h" 116 #include "chrome/browser/managed_mode/managed_user_sync_service.h"
117 #endif 117 #endif
118 118
119 #if defined(ENABLE_MDNS) 119 #if defined(ENABLE_SERVICE_DISCOVERY)
120 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" 120 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
121 #endif 121 #endif
122 122
123 #if defined(ENABLE_PLUGIN_INSTALLATION) 123 #if defined(ENABLE_PLUGIN_INSTALLATION)
124 #include "chrome/browser/plugins/plugins_resource_service.h" 124 #include "chrome/browser/plugins/plugins_resource_service.h"
125 #endif 125 #endif
126 126
127 #if defined(OS_ANDROID) 127 #if defined(OS_ANDROID)
128 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 128 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
129 #include "chrome/browser/android/new_tab_page_prefs.h" 129 #include "chrome/browser/android/new_tab_page_prefs.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 printing::StickySettings::RegisterProfilePrefs(registry); 392 printing::StickySettings::RegisterProfilePrefs(registry);
393 CloudPrintURL::RegisterProfilePrefs(registry); 393 CloudPrintURL::RegisterProfilePrefs(registry);
394 #endif 394 #endif
395 395
396 #if defined(ENABLE_MANAGED_USERS) 396 #if defined(ENABLE_MANAGED_USERS)
397 ManagedUserService::RegisterProfilePrefs(registry); 397 ManagedUserService::RegisterProfilePrefs(registry);
398 ManagedUserSharedSettingsService::RegisterProfilePrefs(registry); 398 ManagedUserSharedSettingsService::RegisterProfilePrefs(registry);
399 ManagedUserSyncService::RegisterProfilePrefs(registry); 399 ManagedUserSyncService::RegisterProfilePrefs(registry);
400 #endif 400 #endif
401 401
402 #if defined(ENABLE_MDNS)
403 LocalDiscoveryUI::RegisterProfilePrefs(registry);
404 #endif
405
406 #if defined(ENABLE_NOTIFICATIONS) 402 #if defined(ENABLE_NOTIFICATIONS)
407 DesktopNotificationService::RegisterProfilePrefs(registry); 403 DesktopNotificationService::RegisterProfilePrefs(registry);
408 #endif 404 #endif
409 405
406 #if defined(ENABLE_SERVICE_DISCOVERY)
407 LocalDiscoveryUI::RegisterProfilePrefs(registry);
408 #endif
409
410 #if defined(OS_ANDROID) 410 #if defined(OS_ANDROID)
411 chrome_variations::VariationsService::RegisterProfilePrefs(registry); 411 chrome_variations::VariationsService::RegisterProfilePrefs(registry);
412 NewTabPagePrefs::RegisterProfilePrefs(registry); 412 NewTabPagePrefs::RegisterProfilePrefs(registry);
413 PartnerBookmarksShim::RegisterProfilePrefs(registry); 413 PartnerBookmarksShim::RegisterProfilePrefs(registry);
414 PromoHandler::RegisterProfilePrefs(registry); 414 PromoHandler::RegisterProfilePrefs(registry);
415 #else 415 #else
416 AppShortcutManager::RegisterProfilePrefs(registry); 416 AppShortcutManager::RegisterProfilePrefs(registry);
417 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); 417 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry);
418 DeviceIDFetcher::RegisterProfilePrefs(registry); 418 DeviceIDFetcher::RegisterProfilePrefs(registry);
419 DevToolsWindow::RegisterProfilePrefs(registry); 419 DevToolsWindow::RegisterProfilePrefs(registry);
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 594 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
595 current_version); 595 current_version);
596 } 596 }
597 597
598 #if defined(OS_CHROMEOS) 598 #if defined(OS_CHROMEOS)
599 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 599 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
600 #endif 600 #endif
601 } 601 }
602 602
603 } // namespace chrome 603 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698