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

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

Issue 2808353008: arc: kArcCompatibleFilesystemChosen pref to local state and integer. (Closed)
Patch Set: Created 3 years, 8 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
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/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 // The native GCM is used on Android instead. 396 // The native GCM is used on Android instead.
397 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry); 397 gcm::GCMChannelStatusSyncer::RegisterPrefs(registry);
398 gcm::RegisterPrefs(registry); 398 gcm::RegisterPrefs(registry);
399 UpgradeDetector::RegisterPrefs(registry); 399 UpgradeDetector::RegisterPrefs(registry);
400 #if !defined(OS_CHROMEOS) 400 #if !defined(OS_CHROMEOS)
401 RegisterDefaultBrowserPromptPrefs(registry); 401 RegisterDefaultBrowserPromptPrefs(registry);
402 #endif // !defined(OS_CHROMEOS) 402 #endif // !defined(OS_CHROMEOS)
403 #endif // !defined(OS_ANDROID) 403 #endif // !defined(OS_ANDROID)
404 404
405 #if defined(OS_CHROMEOS) 405 #if defined(OS_CHROMEOS)
406 arc::ArcSessionManager::RegisterLocalStatePrefs(registry);
406 ChromeOSMetricsProvider::RegisterPrefs(registry); 407 ChromeOSMetricsProvider::RegisterPrefs(registry);
407 chromeos::ArcKioskAppManager::RegisterPrefs(registry); 408 chromeos::ArcKioskAppManager::RegisterPrefs(registry);
408 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry); 409 chromeos::AudioDevicesPrefHandlerImpl::RegisterPrefs(registry);
409 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry); 410 chromeos::ChromeUserManagerImpl::RegisterPrefs(registry);
410 chromeos::DataPromoNotification::RegisterPrefs(registry); 411 chromeos::DataPromoNotification::RegisterPrefs(registry);
411 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); 412 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
412 chromeos::device_settings_cache::RegisterPrefs(registry); 413 chromeos::device_settings_cache::RegisterPrefs(registry);
413 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry); 414 chromeos::EnableDebuggingScreenHandler::RegisterPrefs(registry);
414 chromeos::language_prefs::RegisterPrefs(registry); 415 chromeos::language_prefs::RegisterPrefs(registry);
415 chromeos::KioskAppManager::RegisterPrefs(registry); 416 chromeos::KioskAppManager::RegisterPrefs(registry);
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 } 823 }
823 824
824 std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() { 825 std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() {
825 auto pref_stores = ExpectedPrefStores(); 826 auto pref_stores = ExpectedPrefStores();
826 pref_stores.erase(PrefValueStore::DEFAULT_STORE); 827 pref_stores.erase(PrefValueStore::DEFAULT_STORE);
827 pref_stores.erase(PrefValueStore::USER_STORE); 828 pref_stores.erase(PrefValueStore::USER_STORE);
828 return pref_stores; 829 return pref_stores;
829 } 830 }
830 831
831 } // namespace chrome 832 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698