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

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

Issue 1330773002: [Android] Persist ordering of NTP suggestions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 5 years, 3 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
« no previous file with comments | « chrome/browser/android/most_visited_sites_unittest.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 #include "chrome/browser/supervised_user/supervised_user_service.h" 135 #include "chrome/browser/supervised_user/supervised_user_service.h"
136 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" 136 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
137 #endif 137 #endif
138 138
139 #if defined(ENABLE_SERVICE_DISCOVERY) 139 #if defined(ENABLE_SERVICE_DISCOVERY)
140 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" 140 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
141 #endif 141 #endif
142 142
143 #if defined(OS_ANDROID) 143 #if defined(OS_ANDROID)
144 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 144 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
145 #include "chrome/browser/android/most_visited_sites.h"
145 #include "chrome/browser/android/new_tab_page_prefs.h" 146 #include "chrome/browser/android/new_tab_page_prefs.h"
146 #else 147 #else
147 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" 148 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
148 #include "chrome/browser/ui/startup/startup_browser_creator.h" 149 #include "chrome/browser/ui/startup/startup_browser_creator.h"
149 #endif 150 #endif
150 151
151 #if !defined(OS_ANDROID) && !defined(OS_IOS) 152 #if !defined(OS_ANDROID) && !defined(OS_IOS)
152 #include "chrome/browser/signin/signin_promo.h" 153 #include "chrome/browser/signin/signin_promo.h"
153 #include "chrome/browser/ui/webui/foreign_session_handler.h" 154 #include "chrome/browser/ui/webui/foreign_session_handler.h"
154 #endif 155 #endif
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 defined(OS_ANDROID)
466 variations::VariationsService::RegisterProfilePrefs(registry); 467 variations::VariationsService::RegisterProfilePrefs(registry);
468 MostVisitedSites::RegisterProfilePrefs(registry);
467 NewTabPagePrefs::RegisterProfilePrefs(registry); 469 NewTabPagePrefs::RegisterProfilePrefs(registry);
468 PartnerBookmarksShim::RegisterProfilePrefs(registry); 470 PartnerBookmarksShim::RegisterProfilePrefs(registry);
469 #else 471 #else
470 AppShortcutManager::RegisterProfilePrefs(registry); 472 AppShortcutManager::RegisterProfilePrefs(registry);
471 DeviceIDFetcher::RegisterProfilePrefs(registry); 473 DeviceIDFetcher::RegisterProfilePrefs(registry);
472 DevToolsWindow::RegisterProfilePrefs(registry); 474 DevToolsWindow::RegisterProfilePrefs(registry);
473 DriveAppMapping::RegisterProfilePrefs(registry); 475 DriveAppMapping::RegisterProfilePrefs(registry);
474 extensions::CommandService::RegisterProfilePrefs(registry); 476 extensions::CommandService::RegisterProfilePrefs(registry);
475 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 477 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
476 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry); 478 extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 chrome_browser_net::MigrateNetworkPredictionUserPrefs(profile_prefs); 573 chrome_browser_net::MigrateNetworkPredictionUserPrefs(profile_prefs);
572 #endif 574 #endif
573 575
574 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 576 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
575 // Added 02/2015. 577 // Added 02/2015.
576 MigrateGoogleNowPrefs(profile); 578 MigrateGoogleNowPrefs(profile);
577 #endif 579 #endif
578 } 580 }
579 581
580 } // namespace chrome 582 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/android/most_visited_sites_unittest.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698