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

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

Issue 1412863004: arc-bridge: Add the ARC Bridge Service (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Addressed feedback and fixed failing tests 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" 186 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
187 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 187 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
188 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 188 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
189 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h" 189 #include "chrome/browser/ui/webui/chromeos/login/demo_mode_detector.h"
190 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h" 190 #include "chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler .h"
191 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h" 191 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
192 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h" 192 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
193 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 193 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
194 #include "chromeos/audio/audio_devices_pref_handler_impl.h" 194 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
195 #include "chromeos/timezone/timezone_resolver.h" 195 #include "chromeos/timezone/timezone_resolver.h"
196 #include "components/arc/arc_prefs.h"
196 #include "components/invalidation/impl/invalidator_storage.h" 197 #include "components/invalidation/impl/invalidator_storage.h"
197 #else 198 #else
198 #include "chrome/browser/extensions/default_apps.h" 199 #include "chrome/browser/extensions/default_apps.h"
199 #endif 200 #endif
200 201
201 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST) 202 #if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
202 #include "chrome/browser/ui/app_list/google_now_extension.h" 203 #include "chrome/browser/ui/app_list/google_now_extension.h"
203 #endif 204 #endif
204 205
205 #if defined(OS_MACOSX) 206 #if defined(OS_MACOSX)
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 chromeos::KeyPermissions::RegisterProfilePrefs(registry); 485 chromeos::KeyPermissions::RegisterProfilePrefs(registry);
485 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 486 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
486 chromeos::Preferences::RegisterProfilePrefs(registry); 487 chromeos::Preferences::RegisterProfilePrefs(registry);
487 chromeos::proxy_config::RegisterProfilePrefs(registry); 488 chromeos::proxy_config::RegisterProfilePrefs(registry);
488 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 489 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
489 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 490 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
490 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 491 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
491 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: 492 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::
492 RegisterProfilePrefs(registry); 493 RegisterProfilePrefs(registry);
493 FlagsUI::RegisterProfilePrefs(registry); 494 FlagsUI::RegisterProfilePrefs(registry);
495 arc::ArcPrefs::RegisterProfilePrefs(registry);
494 #endif 496 #endif
495 497
496 #if defined(OS_WIN) 498 #if defined(OS_WIN)
497 component_updater::RegisterProfilePrefsForSwReporter(registry); 499 component_updater::RegisterProfilePrefsForSwReporter(registry);
498 NetworkProfileBubble::RegisterProfilePrefs(registry); 500 NetworkProfileBubble::RegisterProfilePrefs(registry);
499 #endif 501 #endif
500 502
501 #if defined(TOOLKIT_VIEWS) 503 #if defined(TOOLKIT_VIEWS)
502 RegisterBrowserViewProfilePrefs(registry); 504 RegisterBrowserViewProfilePrefs(registry);
503 RegisterInvertBubbleUserPrefs(registry); 505 RegisterInvertBubbleUserPrefs(registry);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 MigrateGoogleNowPrefs(profile); 562 MigrateGoogleNowPrefs(profile);
561 #endif 563 #endif
562 564
563 #if defined(OS_WIN) 565 #if defined(OS_WIN)
564 // Added 11/2015. 566 // Added 11/2015.
565 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated); 567 profile_prefs->ClearPref(kShownAutoLaunchInfobarDeprecated);
566 #endif 568 #endif
567 } 569 }
568 570
569 } // namespace chrome 571 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698