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

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

Issue 599343002: Mirror app list hierarchy data in profile prefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@app_list_folder_pref
Patch Set: add unit test 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
« no previous file with comments | « no previous file | chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc » ('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/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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "chrome/browser/profiles/profile.h" 56 #include "chrome/browser/profiles/profile.h"
57 #include "chrome/browser/profiles/profile_impl.h" 57 #include "chrome/browser/profiles/profile_impl.h"
58 #include "chrome/browser/profiles/profile_info_cache.h" 58 #include "chrome/browser/profiles/profile_info_cache.h"
59 #include "chrome/browser/profiles/profiles_state.h" 59 #include "chrome/browser/profiles/profiles_state.h"
60 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" 60 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
61 #include "chrome/browser/search/search.h" 61 #include "chrome/browser/search/search.h"
62 #include "chrome/browser/services/gcm/gcm_profile_service.h" 62 #include "chrome/browser/services/gcm/gcm_profile_service.h"
63 #include "chrome/browser/signin/signin_manager_factory.h" 63 #include "chrome/browser/signin/signin_manager_factory.h"
64 #include "chrome/browser/signin/signin_promo.h" 64 #include "chrome/browser/signin/signin_promo.h"
65 #include "chrome/browser/task_manager/task_manager.h" 65 #include "chrome/browser/task_manager/task_manager.h"
66 #include "chrome/browser/ui/app_list/app_list_prefs.h"
66 #include "chrome/browser/ui/app_list/app_list_service.h" 67 #include "chrome/browser/ui/app_list/app_list_service.h"
67 #include "chrome/browser/ui/browser_ui_prefs.h" 68 #include "chrome/browser/ui/browser_ui_prefs.h"
68 #include "chrome/browser/ui/navigation_correction_tab_observer.h" 69 #include "chrome/browser/ui/navigation_correction_tab_observer.h"
69 #include "chrome/browser/ui/network_profile_bubble.h" 70 #include "chrome/browser/ui/network_profile_bubble.h"
70 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 71 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
71 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 72 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
72 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 73 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
73 #include "chrome/browser/ui/startup/default_browser_prompt.h" 74 #include "chrome/browser/ui/startup/default_browser_prompt.h"
74 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 75 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
75 #include "chrome/browser/ui/webui/flags_ui.h" 76 #include "chrome/browser/ui/webui/flags_ui.h"
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 #endif 408 #endif
408 409
409 #if defined(ENABLE_EXTENSIONS) 410 #if defined(ENABLE_EXTENSIONS)
410 EasyUnlockService::RegisterProfilePrefs(registry); 411 EasyUnlockService::RegisterProfilePrefs(registry);
411 extensions::ActivityLog::RegisterProfilePrefs(registry); 412 extensions::ActivityLog::RegisterProfilePrefs(registry);
412 extensions::launch_util::RegisterProfilePrefs(registry); 413 extensions::launch_util::RegisterProfilePrefs(registry);
413 ExtensionWebUI::RegisterProfilePrefs(registry); 414 ExtensionWebUI::RegisterProfilePrefs(registry);
414 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); 415 extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
415 #endif 416 #endif
416 417
418 #if defined(ENABLE_APP_LIST)
419 app_list::AppListPrefs::RegisterProfilePrefs(registry);
420 #endif
421
417 #if defined(ENABLE_FULL_PRINTING) 422 #if defined(ENABLE_FULL_PRINTING)
418 print_dialog_cloud::RegisterProfilePrefs(registry); 423 print_dialog_cloud::RegisterProfilePrefs(registry);
419 printing::StickySettings::RegisterProfilePrefs(registry); 424 printing::StickySettings::RegisterProfilePrefs(registry);
420 #endif 425 #endif
421 426
422 #if defined(ENABLE_MANAGED_USERS) 427 #if defined(ENABLE_MANAGED_USERS)
423 SupervisedUserService::RegisterProfilePrefs(registry); 428 SupervisedUserService::RegisterProfilePrefs(registry);
424 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); 429 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry);
425 SupervisedUserSyncService::RegisterProfilePrefs(registry); 430 SupervisedUserSyncService::RegisterProfilePrefs(registry);
426 #endif 431 #endif
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 #if defined(OS_CHROMEOS) 628 #if defined(OS_CHROMEOS)
624 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 629 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
625 #endif 630 #endif
626 631
627 #if defined(TOOLKIT_VIEWS) 632 #if defined(TOOLKIT_VIEWS)
628 MigrateBrowserTabStripPrefs(local_state); 633 MigrateBrowserTabStripPrefs(local_state);
629 #endif 634 #endif
630 } 635 }
631 636
632 } // namespace chrome 637 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698