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

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

Issue 295413002: [fsp] Store mounted file systems in preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up. Created 6 years, 6 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 | Annotate | Revision Log
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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" 130 #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h"
131 #endif 131 #endif
132 132
133 #if defined(OS_CHROMEOS) 133 #if defined(OS_CHROMEOS)
134 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 134 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
135 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" 135 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
136 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h" 136 #include "chrome/browser/chromeos/audio/audio_devices_pref_handler_impl.h"
137 #include "chrome/browser/chromeos/customization_document.h" 137 #include "chrome/browser/chromeos/customization_document.h"
138 #include "chrome/browser/chromeos/display/display_preferences.h" 138 #include "chrome/browser/chromeos/display/display_preferences.h"
139 #include "chrome/browser/chromeos/extensions/echo_private_api.h" 139 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
140 #include "chrome/browser/chromeos/file_system_provider/service.h"
140 #include "chrome/browser/chromeos/first_run/first_run.h" 141 #include "chrome/browser/chromeos/first_run/first_run.h"
141 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h" 142 #include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h"
142 #include "chrome/browser/chromeos/login/login_utils.h" 143 #include "chrome/browser/chromeos/login/login_utils.h"
143 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h" 144 #include "chrome/browser/chromeos/login/saml/saml_offline_signin_limiter.h"
144 #include "chrome/browser/chromeos/login/startup_utils.h" 145 #include "chrome/browser/chromeos/login/startup_utils.h"
145 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 146 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
146 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" 147 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
147 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h" 148 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
148 #include "chrome/browser/chromeos/login/users/user_manager.h" 149 #include "chrome/browser/chromeos/login/users/user_manager.h"
149 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 150 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 notifier::ChromeNotifierService::RegisterProfilePrefs(registry); 420 notifier::ChromeNotifierService::RegisterProfilePrefs(registry);
420 PepperFlashSettingsManager::RegisterProfilePrefs(registry); 421 PepperFlashSettingsManager::RegisterProfilePrefs(registry);
421 PinnedTabCodec::RegisterProfilePrefs(registry); 422 PinnedTabCodec::RegisterProfilePrefs(registry);
422 PluginsUI::RegisterProfilePrefs(registry); 423 PluginsUI::RegisterProfilePrefs(registry);
423 RegisterAutolaunchUserPrefs(registry); 424 RegisterAutolaunchUserPrefs(registry);
424 signin::RegisterProfilePrefs(registry); 425 signin::RegisterProfilePrefs(registry);
425 #endif 426 #endif
426 427
427 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 428 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
428 default_apps::RegisterProfilePrefs(registry); 429 default_apps::RegisterProfilePrefs(registry);
429 #endif 430 #endif
hashimoto 2014/05/26 08:35:38 nit: Why did you remove this blank line?
mtomasz 2014/05/27 02:10:27 Accident. Done.
430
431 #if defined(OS_CHROMEOS) 431 #if defined(OS_CHROMEOS)
432 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs( 432 chromeos::attestation::PlatformVerificationFlow::RegisterProfilePrefs(
433 registry); 433 registry);
434 chromeos::first_run::RegisterProfilePrefs(registry); 434 chromeos::first_run::RegisterProfilePrefs(registry);
435 chromeos::file_system_provider::RegisterProfilePrefs(registry);
435 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 436 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
436 chromeos::Preferences::RegisterProfilePrefs(registry); 437 chromeos::Preferences::RegisterProfilePrefs(registry);
437 chromeos::proxy_config::RegisterProfilePrefs(registry); 438 chromeos::proxy_config::RegisterProfilePrefs(registry);
438 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 439 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
439 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 440 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
440 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry); 441 chromeos::UserImageSyncObserver::RegisterProfilePrefs(registry);
441 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: 442 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::
442 RegisterProfilePrefs(registry); 443 RegisterProfilePrefs(registry);
443 FlagsUI::RegisterProfilePrefs(registry); 444 FlagsUI::RegisterProfilePrefs(registry);
444 #endif 445 #endif
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 574 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
574 current_version); 575 current_version);
575 } 576 }
576 577
577 #if defined(OS_CHROMEOS) 578 #if defined(OS_CHROMEOS)
578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 579 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
579 #endif 580 #endif
580 } 581 }
581 582
582 } // namespace chrome 583 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698