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

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

Issue 256763004: Remove WebUI NTP on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: newt's nits Created 6 years, 7 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 "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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
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"
130 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h"
131 #else 130 #else
132 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" 131 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"
133 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" 132 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
134 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" 133 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
135 #endif 134 #endif
136 135
137 #if defined(OS_CHROMEOS) 136 #if defined(OS_CHROMEOS)
138 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 137 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
139 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" 138 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
140 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" 139 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h"
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 ExtensionWebUI::RegisterProfilePrefs(registry); 349 ExtensionWebUI::RegisterProfilePrefs(registry);
351 HostContentSettingsMap::RegisterProfilePrefs(registry); 350 HostContentSettingsMap::RegisterProfilePrefs(registry);
352 IncognitoModePrefs::RegisterProfilePrefs(registry); 351 IncognitoModePrefs::RegisterProfilePrefs(registry);
353 InstantUI::RegisterProfilePrefs(registry); 352 InstantUI::RegisterProfilePrefs(registry);
354 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); 353 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry);
355 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); 354 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
356 MediaDeviceIDSalt::RegisterProfilePrefs(registry); 355 MediaDeviceIDSalt::RegisterProfilePrefs(registry);
357 MediaStreamDevicesController::RegisterProfilePrefs(registry); 356 MediaStreamDevicesController::RegisterProfilePrefs(registry);
358 NetPrefObserver::RegisterProfilePrefs(registry); 357 NetPrefObserver::RegisterProfilePrefs(registry);
359 NetworkTimeService::RegisterProfilePrefs(registry); 358 NetworkTimeService::RegisterProfilePrefs(registry);
360 NewTabUI::RegisterProfilePrefs(registry); 359
361 password_manager::PasswordManager::RegisterProfilePrefs(registry); 360 password_manager::PasswordManager::RegisterProfilePrefs(registry);
362 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); 361 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
363 PrefsTabHelper::RegisterProfilePrefs(registry); 362 PrefsTabHelper::RegisterProfilePrefs(registry);
364 Profile::RegisterProfilePrefs(registry); 363 Profile::RegisterProfilePrefs(registry);
365 ProfileImpl::RegisterProfilePrefs(registry); 364 ProfileImpl::RegisterProfilePrefs(registry);
366 PromoResourceService::RegisterProfilePrefs(registry); 365 PromoResourceService::RegisterProfilePrefs(registry);
367 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); 366 ProtocolHandlerRegistry::RegisterProfilePrefs(registry);
368 RegisterBrowserUserPrefs(registry); 367 RegisterBrowserUserPrefs(registry);
369 SessionStartupPref::RegisterProfilePrefs(registry); 368 SessionStartupPref::RegisterProfilePrefs(registry);
370 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); 369 TemplateURLPrepopulateData::RegisterProfilePrefs(registry);
(...skipping 28 matching lines...) Expand all
399 #endif 398 #endif
400 399
401 #if defined(ENABLE_SERVICE_DISCOVERY) 400 #if defined(ENABLE_SERVICE_DISCOVERY)
402 LocalDiscoveryUI::RegisterProfilePrefs(registry); 401 LocalDiscoveryUI::RegisterProfilePrefs(registry);
403 #endif 402 #endif
404 403
405 #if defined(OS_ANDROID) 404 #if defined(OS_ANDROID)
406 chrome_variations::VariationsService::RegisterProfilePrefs(registry); 405 chrome_variations::VariationsService::RegisterProfilePrefs(registry);
407 NewTabPagePrefs::RegisterProfilePrefs(registry); 406 NewTabPagePrefs::RegisterProfilePrefs(registry);
408 PartnerBookmarksShim::RegisterProfilePrefs(registry); 407 PartnerBookmarksShim::RegisterProfilePrefs(registry);
409 PromoHandler::RegisterProfilePrefs(registry);
410 #else 408 #else
411 AppShortcutManager::RegisterProfilePrefs(registry); 409 AppShortcutManager::RegisterProfilePrefs(registry);
412 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); 410 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry);
413 DeviceIDFetcher::RegisterProfilePrefs(registry); 411 DeviceIDFetcher::RegisterProfilePrefs(registry);
414 DevToolsWindow::RegisterProfilePrefs(registry); 412 DevToolsWindow::RegisterProfilePrefs(registry);
415 extensions::CommandService::RegisterProfilePrefs(registry); 413 extensions::CommandService::RegisterProfilePrefs(registry);
416 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 414 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
417 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 415 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
418 first_run::RegisterProfilePrefs(registry); 416 first_run::RegisterProfilePrefs(registry);
417 NewTabUI::RegisterProfilePrefs(registry);
419 notifier::ChromeNotifierService::RegisterProfilePrefs(registry); 418 notifier::ChromeNotifierService::RegisterProfilePrefs(registry);
420 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 419 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
421 PinnedTabCodec::RegisterProfilePrefs(registry); 420 PinnedTabCodec::RegisterProfilePrefs(registry);
422 PluginsUI::RegisterProfilePrefs(registry); 421 PluginsUI::RegisterProfilePrefs(registry);
423 RegisterAutolaunchUserPrefs(registry); 422 RegisterAutolaunchUserPrefs(registry);
424 signin::RegisterProfilePrefs(registry); 423 signin::RegisterProfilePrefs(registry);
425 #endif 424 #endif
426 425
427 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 426 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
428 default_apps::RegisterProfilePrefs(registry); 427 default_apps::RegisterProfilePrefs(registry);
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 572 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
574 current_version); 573 current_version);
575 } 574 }
576 575
577 #if defined(OS_CHROMEOS) 576 #if defined(OS_CHROMEOS)
578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 577 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
579 #endif 578 #endif
580 } 579 }
581 580
582 } // namespace chrome 581 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698