Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 48 #include "chrome/browser/profiles/profile_info_cache.h" | 48 #include "chrome/browser/profiles/profile_info_cache.h" |
| 49 #include "chrome/browser/profiles/profiles_state.h" | 49 #include "chrome/browser/profiles/profiles_state.h" |
| 50 #include "chrome/browser/push_messaging/push_messaging_service_impl.h" | 50 #include "chrome/browser/push_messaging/push_messaging_service_impl.h" |
| 51 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 51 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
| 52 #include "chrome/browser/search/search.h" | 52 #include "chrome/browser/search/search.h" |
| 53 #include "chrome/browser/signin/signin_manager_factory.h" | 53 #include "chrome/browser/signin/signin_manager_factory.h" |
| 54 #include "chrome/browser/task_manager/task_manager.h" | 54 #include "chrome/browser/task_manager/task_manager.h" |
| 55 #include "chrome/browser/tracing/chrome_tracing_delegate.h" | 55 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
| 56 #include "chrome/browser/ui/app_list/app_list_prefs.h" | 56 #include "chrome/browser/ui/app_list/app_list_prefs.h" |
| 57 #include "chrome/browser/ui/app_list/app_list_service.h" | 57 #include "chrome/browser/ui/app_list/app_list_service.h" |
| 58 #include "chrome/browser/ui/app_list/arc_app_prefs.h" | |
| 58 #include "chrome/browser/ui/browser_ui_prefs.h" | 59 #include "chrome/browser/ui/browser_ui_prefs.h" |
| 59 #include "chrome/browser/ui/navigation_correction_tab_observer.h" | 60 #include "chrome/browser/ui/navigation_correction_tab_observer.h" |
| 60 #include "chrome/browser/ui/network_profile_bubble.h" | 61 #include "chrome/browser/ui/network_profile_bubble.h" |
| 61 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" | 62 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" |
| 62 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 63 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
| 63 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 64 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| 64 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 65 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 65 #include "chrome/browser/ui/webui/flags_ui.h" | 66 #include "chrome/browser/ui/webui/flags_ui.h" |
| 66 #include "chrome/browser/ui/webui/instant_ui.h" | 67 #include "chrome/browser/ui/webui/instant_ui.h" |
| 67 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 68 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 512 RegisterInvertBubbleUserPrefs(registry); | 513 RegisterInvertBubbleUserPrefs(registry); |
| 513 #endif | 514 #endif |
| 514 | 515 |
| 515 #if defined(USE_ASH) | 516 #if defined(USE_ASH) |
| 516 ash::RegisterChromeLauncherUserPrefs(registry); | 517 ash::RegisterChromeLauncherUserPrefs(registry); |
| 517 #endif | 518 #endif |
| 518 | 519 |
| 519 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 520 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 520 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); | 521 browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry); |
| 521 #endif | 522 #endif |
| 523 ArcAppPrefs::RegisterProfilePrefs(registry); | |
|
elijahtaylor1
2015/10/28 06:32:38
this should probably be in the OS_CHROMEOS section
khmel1
2015/10/29 08:12:18
Done.
| |
| 522 } | 524 } |
| 523 | 525 |
| 524 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 526 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 525 RegisterProfilePrefs(registry); | 527 RegisterProfilePrefs(registry); |
| 526 | 528 |
| 527 #if defined(OS_CHROMEOS) | 529 #if defined(OS_CHROMEOS) |
| 528 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); | 530 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); |
| 529 #endif | 531 #endif |
| 530 } | 532 } |
| 531 | 533 |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 562 translate::TranslatePrefs::MigrateUserPrefs(profile_prefs, | 564 translate::TranslatePrefs::MigrateUserPrefs(profile_prefs, |
| 563 prefs::kAcceptLanguages); | 565 prefs::kAcceptLanguages); |
| 564 | 566 |
| 565 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) | 567 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) |
| 566 // Added 02/2015. | 568 // Added 02/2015. |
| 567 MigrateGoogleNowPrefs(profile); | 569 MigrateGoogleNowPrefs(profile); |
| 568 #endif | 570 #endif |
| 569 } | 571 } |
| 570 | 572 |
| 571 } // namespace chrome | 573 } // namespace chrome |
| OLD | NEW |