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

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

Issue 1413153007: arc-app-launcher: Minimal support for ARC app launcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Process xiyuan Created 5 years, 1 month 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/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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 #include "chrome/browser/chromeos/preferences.h" 180 #include "chrome/browser/chromeos/preferences.h"
181 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 181 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
182 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 182 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
183 #include "chrome/browser/chromeos/status/data_promo_notification.h" 183 #include "chrome/browser/chromeos/status/data_promo_notification.h"
184 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 184 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
185 #include "chrome/browser/chromeos/system/input_device_settings.h" 185 #include "chrome/browser/chromeos/system/input_device_settings.h"
186 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 186 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
187 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" 187 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
188 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 188 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
189 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 189 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
190 #include "chrome/browser/ui/app_list/arc_app_prefs.h"
190 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" 191 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h"
191 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h" 192 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h"
192 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 193 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
193 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 194 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
194 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 195 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
195 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 196 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
196 #include "chromeos/timezone/timezone_resolver.h" 197 #include "chromeos/timezone/timezone_resolver.h"
198 #include "components/arc/arc_prefs.h"
khmel1 2015/11/12 08:18:13 Sorry, this accidentally came after getting latest
197 #include "components/invalidation/impl/invalidator_storage.h" 199 #include "components/invalidation/impl/invalidator_storage.h"
198 #else 200 #else
199 #include "chrome/browser/extensions/default_apps.h" 201 #include "chrome/browser/extensions/default_apps.h"
200 #endif 202 #endif
201 203
202 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 204 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
203 #include "chrome/browser/ui/app_list/google_now_extension.h" 205 #include "chrome/browser/ui/app_list/google_now_extension.h"
204 #endif 206 #endif
205 207
206 #if defined(OS_MACOSX) 208 #if defined(OS_MACOSX)
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 chromeos::KeyPermissions::RegisterProfilePrefs(registry); 497 chromeos::KeyPermissions::RegisterProfilePrefs(registry);
496 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 498 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
497 chromeos::Preferences::RegisterProfilePrefs(registry); 499 chromeos::Preferences::RegisterProfilePrefs(registry);
498 chromeos::proxy_config::RegisterProfilePrefs(registry); 500 chromeos::proxy_config::RegisterProfilePrefs(registry);
499 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 501 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
500 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 502 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
501 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 503 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
502 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: 504 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::
503 RegisterProfilePrefs(registry); 505 RegisterProfilePrefs(registry);
504 FlagsUI::RegisterProfilePrefs(registry); 506 FlagsUI::RegisterProfilePrefs(registry);
507 arc::ArcPrefs::RegisterProfilePrefs(registry);
508 ArcAppPrefs::RegisterProfilePrefs(registry);
505 #endif 509 #endif
506 510
507 #if defined(OS_WIN) 511 #if defined(OS_WIN)
508 component_updater::RegisterProfilePrefsForSwReporter(registry); 512 component_updater::RegisterProfilePrefsForSwReporter(registry);
509 NetworkProfileBubble::RegisterProfilePrefs(registry); 513 NetworkProfileBubble::RegisterProfilePrefs(registry);
510 #endif 514 #endif
511 515
512 #if defined(TOOLKIT_VIEWS) 516 #if defined(TOOLKIT_VIEWS)
513 RegisterBrowserViewProfilePrefs(registry); 517 RegisterBrowserViewProfilePrefs(registry);
514 RegisterInvertBubbleUserPrefs(registry); 518 RegisterInvertBubbleUserPrefs(registry);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 translate::TranslatePrefs::MigrateUserPrefs(profile_prefs, 568 translate::TranslatePrefs::MigrateUserPrefs(profile_prefs,
565 prefs::kAcceptLanguages); 569 prefs::kAcceptLanguages);
566 570
567 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 571 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
568 // Added 02/2015. 572 // Added 02/2015.
569 MigrateGoogleNowPrefs(profile); 573 MigrateGoogleNowPrefs(profile);
570 #endif 574 #endif
571 } 575 }
572 576
573 } // namespace chrome 577 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/app_list/app_list_syncable_service.h » ('j') | chromeos/arc/bridge/common/arc_host_messages.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698