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

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

Issue 539173004: Bring up of the enhanced bookmarks cluster service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@intermediary2
Patch Set: dictionaty to dictionary Created 6 years, 2 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 <string> 7 #include <string>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "chrome/browser/ui/webui/instant_ui.h" 76 #include "chrome/browser/ui/webui/instant_ui.h"
77 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 77 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
78 #include "chrome/browser/ui/webui/plugins_ui.h" 78 #include "chrome/browser/ui/webui/plugins_ui.h"
79 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 79 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
80 #include "chrome/browser/upgrade_detector.h" 80 #include "chrome/browser/upgrade_detector.h"
81 #include "chrome/browser/web_resource/promo_resource_service.h" 81 #include "chrome/browser/web_resource/promo_resource_service.h"
82 #include "chrome/common/pref_names.h" 82 #include "chrome/common/pref_names.h"
83 #include "components/autofill/core/browser/autofill_manager.h" 83 #include "components/autofill/core/browser/autofill_manager.h"
84 #include "components/bookmarks/browser/bookmark_utils.h" 84 #include "components/bookmarks/browser/bookmark_utils.h"
85 #include "components/dom_distiller/core/distilled_page_prefs.h" 85 #include "components/dom_distiller/core/distilled_page_prefs.h"
86 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h"
86 #include "components/gcm_driver/gcm_channel_status_syncer.h" 87 #include "components/gcm_driver/gcm_channel_status_syncer.h"
87 #include "components/google/core/browser/google_pref_names.h" 88 #include "components/google/core/browser/google_pref_names.h"
88 #include "components/google/core/browser/google_url_tracker.h" 89 #include "components/google/core/browser/google_url_tracker.h"
89 #include "components/network_time/network_time_tracker.h" 90 #include "components/network_time/network_time_tracker.h"
90 #include "components/password_manager/core/browser/password_manager.h" 91 #include "components/password_manager/core/browser/password_manager.h"
91 #include "components/pref_registry/pref_registry_syncable.h" 92 #include "components/pref_registry/pref_registry_syncable.h"
92 #include "components/rappor/rappor_service.h" 93 #include "components/rappor/rappor_service.h"
93 #include "components/search_engines/template_url_prepopulate_data.h" 94 #include "components/search_engines/template_url_prepopulate_data.h"
94 #include "components/sync_driver/sync_prefs.h" 95 #include "components/sync_driver/sync_prefs.h"
95 #include "components/translate/core/browser/translate_prefs.h" 96 #include "components/translate/core/browser/translate_prefs.h"
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); 370 sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
370 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 371 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
371 ChromeVersionService::RegisterProfilePrefs(registry); 372 ChromeVersionService::RegisterProfilePrefs(registry);
372 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( 373 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs(
373 registry); 374 registry);
374 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 375 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
375 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); 376 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry);
376 chrome_prefs::RegisterProfilePrefs(registry); 377 chrome_prefs::RegisterProfilePrefs(registry);
377 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); 378 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry);
378 DownloadPrefs::RegisterProfilePrefs(registry); 379 DownloadPrefs::RegisterProfilePrefs(registry);
380 enhanced_bookmarks::BookmarkServerClusterService::RegisterPrefs(registry);
379 gcm::GCMProfileService::RegisterProfilePrefs(registry); 381 gcm::GCMProfileService::RegisterProfilePrefs(registry);
380 HostContentSettingsMap::RegisterProfilePrefs(registry); 382 HostContentSettingsMap::RegisterProfilePrefs(registry);
381 IncognitoModePrefs::RegisterProfilePrefs(registry); 383 IncognitoModePrefs::RegisterProfilePrefs(registry);
382 InstantUI::RegisterProfilePrefs(registry); 384 InstantUI::RegisterProfilePrefs(registry);
383 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); 385 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry);
384 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); 386 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
385 MediaDeviceIDSalt::RegisterProfilePrefs(registry); 387 MediaDeviceIDSalt::RegisterProfilePrefs(registry);
386 MediaStreamDevicesController::RegisterProfilePrefs(registry); 388 MediaStreamDevicesController::RegisterProfilePrefs(registry);
387 NetPrefObserver::RegisterProfilePrefs(registry); 389 NetPrefObserver::RegisterProfilePrefs(registry);
388 password_manager::PasswordManager::RegisterProfilePrefs(registry); 390 password_manager::PasswordManager::RegisterProfilePrefs(registry);
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 #if defined(OS_CHROMEOS) 625 #if defined(OS_CHROMEOS)
624 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 626 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
625 #endif 627 #endif
626 628
627 #if defined(TOOLKIT_VIEWS) 629 #if defined(TOOLKIT_VIEWS)
628 MigrateBrowserTabStripPrefs(local_state); 630 MigrateBrowserTabStripPrefs(local_state);
629 #endif 631 #endif
630 } 632 }
631 633
632 } // namespace chrome 634 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698