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

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: micro-nit 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 #include "chrome/browser/ui/webui/instant_ui.h" 77 #include "chrome/browser/ui/webui/instant_ui.h"
78 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 78 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
79 #include "chrome/browser/ui/webui/plugins_ui.h" 79 #include "chrome/browser/ui/webui/plugins_ui.h"
80 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 80 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
81 #include "chrome/browser/upgrade_detector.h" 81 #include "chrome/browser/upgrade_detector.h"
82 #include "chrome/browser/web_resource/promo_resource_service.h" 82 #include "chrome/browser/web_resource/promo_resource_service.h"
83 #include "chrome/common/pref_names.h" 83 #include "chrome/common/pref_names.h"
84 #include "components/autofill/core/browser/autofill_manager.h" 84 #include "components/autofill/core/browser/autofill_manager.h"
85 #include "components/bookmarks/browser/bookmark_utils.h" 85 #include "components/bookmarks/browser/bookmark_utils.h"
86 #include "components/dom_distiller/core/distilled_page_prefs.h" 86 #include "components/dom_distiller/core/distilled_page_prefs.h"
87 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h"
87 #include "components/gcm_driver/gcm_channel_status_syncer.h" 88 #include "components/gcm_driver/gcm_channel_status_syncer.h"
88 #include "components/google/core/browser/google_pref_names.h" 89 #include "components/google/core/browser/google_pref_names.h"
89 #include "components/google/core/browser/google_url_tracker.h" 90 #include "components/google/core/browser/google_url_tracker.h"
90 #include "components/network_time/network_time_tracker.h" 91 #include "components/network_time/network_time_tracker.h"
91 #include "components/password_manager/core/browser/password_manager.h" 92 #include "components/password_manager/core/browser/password_manager.h"
92 #include "components/pref_registry/pref_registry_syncable.h" 93 #include "components/pref_registry/pref_registry_syncable.h"
93 #include "components/rappor/rappor_service.h" 94 #include "components/rappor/rappor_service.h"
94 #include "components/search_engines/template_url_prepopulate_data.h" 95 #include "components/search_engines/template_url_prepopulate_data.h"
95 #include "components/sync_driver/sync_prefs.h" 96 #include "components/sync_driver/sync_prefs.h"
96 #include "components/translate/core/browser/translate_prefs.h" 97 #include "components/translate/core/browser/translate_prefs.h"
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); 375 sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
375 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 376 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
376 ChromeVersionService::RegisterProfilePrefs(registry); 377 ChromeVersionService::RegisterProfilePrefs(registry);
377 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( 378 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs(
378 registry); 379 registry);
379 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 380 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
380 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); 381 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry);
381 chrome_prefs::RegisterProfilePrefs(registry); 382 chrome_prefs::RegisterProfilePrefs(registry);
382 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); 383 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry);
383 DownloadPrefs::RegisterProfilePrefs(registry); 384 DownloadPrefs::RegisterProfilePrefs(registry);
385 enhanced_bookmarks::BookmarkServerClusterService::RegisterPrefs(registry);
384 gcm::GCMProfileService::RegisterProfilePrefs(registry); 386 gcm::GCMProfileService::RegisterProfilePrefs(registry);
385 HostContentSettingsMap::RegisterProfilePrefs(registry); 387 HostContentSettingsMap::RegisterProfilePrefs(registry);
386 IncognitoModePrefs::RegisterProfilePrefs(registry); 388 IncognitoModePrefs::RegisterProfilePrefs(registry);
387 InstantUI::RegisterProfilePrefs(registry); 389 InstantUI::RegisterProfilePrefs(registry);
388 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); 390 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry);
389 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); 391 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
390 MediaDeviceIDSalt::RegisterProfilePrefs(registry); 392 MediaDeviceIDSalt::RegisterProfilePrefs(registry);
391 MediaStreamDevicesController::RegisterProfilePrefs(registry); 393 MediaStreamDevicesController::RegisterProfilePrefs(registry);
392 NetPrefObserver::RegisterProfilePrefs(registry); 394 NetPrefObserver::RegisterProfilePrefs(registry);
393 password_manager::PasswordManager::RegisterProfilePrefs(registry); 395 password_manager::PasswordManager::RegisterProfilePrefs(registry);
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 #if defined(OS_CHROMEOS) 634 #if defined(OS_CHROMEOS)
633 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 635 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
634 #endif 636 #endif
635 637
636 #if defined(TOOLKIT_VIEWS) 638 #if defined(TOOLKIT_VIEWS)
637 MigrateBrowserTabStripPrefs(local_state); 639 MigrateBrowserTabStripPrefs(local_state);
638 #endif 640 #endif
639 } 641 }
640 642
641 } // namespace chrome 643 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698