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

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

Issue 1459793002: Android: Allow compiling browser without Java UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
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 <string> 7 #include <string>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "chrome/browser/ui/navigation_correction_tab_observer.h" 59 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
60 #include "chrome/browser/ui/network_profile_bubble.h" 60 #include "chrome/browser/ui/network_profile_bubble.h"
61 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 61 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
62 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 62 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
63 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 63 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
64 #include "chrome/browser/ui/webui/flags_ui.h" 64 #include "chrome/browser/ui/webui/flags_ui.h"
65 #include "chrome/browser/ui/webui/instant_ui.h" 65 #include "chrome/browser/ui/webui/instant_ui.h"
66 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 66 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
67 #include "chrome/browser/ui/webui/plugins_ui.h" 67 #include "chrome/browser/ui/webui/plugins_ui.h"
68 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 68 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
69 #include "chrome/common/features.h"
69 #include "chrome/common/pref_names.h" 70 #include "chrome/common/pref_names.h"
70 #include "components/autofill/core/browser/autofill_manager.h" 71 #include "components/autofill/core/browser/autofill_manager.h"
71 #include "components/content_settings/core/browser/host_content_settings_map.h" 72 #include "components/content_settings/core/browser/host_content_settings_map.h"
72 #include "components/dom_distiller/core/distilled_page_prefs.h" 73 #include "components/dom_distiller/core/distilled_page_prefs.h"
73 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h" 74 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h"
74 #include "components/flags_ui/pref_service_flags_storage.h" 75 #include "components/flags_ui/pref_service_flags_storage.h"
75 #include "components/gcm_driver/gcm_channel_status_syncer.h" 76 #include "components/gcm_driver/gcm_channel_status_syncer.h"
76 #include "components/network_time/network_time_tracker.h" 77 #include "components/network_time/network_time_tracker.h"
77 #include "components/omnibox/browser/zero_suggest_provider.h" 78 #include "components/omnibox/browser/zero_suggest_provider.h"
78 #include "components/password_manager/core/browser/password_bubble_experiment.h" 79 #include "components/password_manager/core/browser/password_bubble_experiment.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h" 132 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h"
132 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" 133 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
133 #include "chrome/browser/supervised_user/supervised_user_service.h" 134 #include "chrome/browser/supervised_user/supervised_user_service.h"
134 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" 135 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
135 #endif 136 #endif
136 137
137 #if defined(ENABLE_SERVICE_DISCOVERY) 138 #if defined(ENABLE_SERVICE_DISCOVERY)
138 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" 139 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
139 #endif 140 #endif
140 141
141 #if defined(OS_ANDROID) 142 #if BUILDFLAG(ANDROID_JAVA_UI)
142 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 143 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
143 #include "chrome/browser/android/most_visited_sites.h" 144 #include "chrome/browser/android/most_visited_sites.h"
144 #include "chrome/browser/android/new_tab_page_prefs.h" 145 #include "chrome/browser/android/new_tab_page_prefs.h"
145 #include "chrome/browser/android/popular_sites.h" 146 #include "chrome/browser/android/popular_sites.h"
146 #else 147 #else
147 #include "chrome/browser/ui/startup/startup_browser_creator.h" 148 #include "chrome/browser/ui/startup/startup_browser_creator.h"
148 #include "chrome/browser/upgrade_detector.h" 149 #include "chrome/browser/upgrade_detector.h"
149 #endif 150 #endif
150 151
151 #if !defined(OS_ANDROID) && !defined(OS_IOS) 152 #if !defined(OS_ANDROID) && !defined(OS_IOS)
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 #if defined(ENABLE_SUPERVISED_USERS) 456 #if defined(ENABLE_SUPERVISED_USERS)
456 #if !defined(OS_ANDROID) && !defined(OS_IOS) 457 #if !defined(OS_ANDROID) && !defined(OS_IOS)
457 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); 458 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry);
458 SupervisedUserSyncService::RegisterProfilePrefs(registry); 459 SupervisedUserSyncService::RegisterProfilePrefs(registry);
459 #endif 460 #endif
460 ChildAccountService::RegisterProfilePrefs(registry); 461 ChildAccountService::RegisterProfilePrefs(registry);
461 SupervisedUserService::RegisterProfilePrefs(registry); 462 SupervisedUserService::RegisterProfilePrefs(registry);
462 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); 463 SupervisedUserWhitelistService::RegisterProfilePrefs(registry);
463 #endif 464 #endif
464 465
465 #if defined(OS_ANDROID) 466 #if BUILDFLAG(ANDROID_JAVA_UI)
466 variations::VariationsService::RegisterProfilePrefs(registry); 467 variations::VariationsService::RegisterProfilePrefs(registry);
467 MostVisitedSites::RegisterProfilePrefs(registry); 468 MostVisitedSites::RegisterProfilePrefs(registry);
468 NewTabPagePrefs::RegisterProfilePrefs(registry); 469 NewTabPagePrefs::RegisterProfilePrefs(registry);
469 PartnerBookmarksShim::RegisterProfilePrefs(registry); 470 PartnerBookmarksShim::RegisterProfilePrefs(registry);
470 PopularSites::RegisterProfilePrefs(registry); 471 PopularSites::RegisterProfilePrefs(registry);
471 #else 472 #else
472 AppShortcutManager::RegisterProfilePrefs(registry); 473 AppShortcutManager::RegisterProfilePrefs(registry);
473 DeviceIDFetcher::RegisterProfilePrefs(registry); 474 DeviceIDFetcher::RegisterProfilePrefs(registry);
474 DevToolsWindow::RegisterProfilePrefs(registry); 475 DevToolsWindow::RegisterProfilePrefs(registry);
475 DriveAppMapping::RegisterProfilePrefs(registry); 476 DriveAppMapping::RegisterProfilePrefs(registry);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 // Added 11/2015. 578 // Added 11/2015.
578 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); 579 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated);
579 #endif 580 #endif
580 581
581 // Added 12/1015. 582 // Added 12/1015.
582 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld); 583 profile_prefs->ClearPref(kURLsToRestoreOnStartupOld);
583 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime); 584 profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime);
584 } 585 }
585 586
586 } // namespace chrome 587 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698