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

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

Issue 2809773004: Wait for compliance report to start ARC Kiosk app. (Closed)
Patch Set: small comment update 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 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 gcm::RegisterProfilePrefs(registry); 589 gcm::RegisterProfilePrefs(registry);
590 StartupBrowserCreator::RegisterProfilePrefs(registry); 590 StartupBrowserCreator::RegisterProfilePrefs(registry);
591 #endif 591 #endif
592 592
593 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 593 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
594 default_apps::RegisterProfilePrefs(registry); 594 default_apps::RegisterProfilePrefs(registry);
595 #endif 595 #endif
596 596
597 #if defined(OS_CHROMEOS) 597 #if defined(OS_CHROMEOS)
598 arc::ArcSessionManager::RegisterProfilePrefs(registry); 598 arc::ArcSessionManager::RegisterProfilePrefs(registry);
599 arc::ArcPolicyBridge::RegisterProfilePrefs(registry);
599 chromeos::first_run::RegisterProfilePrefs(registry); 600 chromeos::first_run::RegisterProfilePrefs(registry);
600 chromeos::file_system_provider::RegisterProfilePrefs(registry); 601 chromeos::file_system_provider::RegisterProfilePrefs(registry);
601 chromeos::KeyPermissions::RegisterProfilePrefs(registry); 602 chromeos::KeyPermissions::RegisterProfilePrefs(registry);
602 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry); 603 chromeos::MultiProfileUserController::RegisterProfilePrefs(registry);
603 chromeos::quick_unlock::PinStorage::RegisterProfilePrefs(registry); 604 chromeos::quick_unlock::PinStorage::RegisterProfilePrefs(registry);
604 chromeos::Preferences::RegisterProfilePrefs(registry); 605 chromeos::Preferences::RegisterProfilePrefs(registry);
605 chromeos::PrintersManager::RegisterProfilePrefs(registry); 606 chromeos::PrintersManager::RegisterProfilePrefs(registry);
606 chromeos::quick_unlock::RegisterProfilePrefs(registry); 607 chromeos::quick_unlock::RegisterProfilePrefs(registry);
607 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry); 608 chromeos::SAMLOfflineSigninLimiter::RegisterProfilePrefs(registry);
608 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry); 609 chromeos::ServicesCustomizationDocument::RegisterProfilePrefs(registry);
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 } 809 }
809 810
810 std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() { 811 std::set<PrefValueStore::PrefStoreType> InProcessPrefStores() {
811 auto pref_stores = ExpectedPrefStores(); 812 auto pref_stores = ExpectedPrefStores();
812 pref_stores.erase(PrefValueStore::DEFAULT_STORE); 813 pref_stores.erase(PrefValueStore::DEFAULT_STORE);
813 pref_stores.erase(PrefValueStore::USER_STORE); 814 pref_stores.erase(PrefValueStore::USER_STORE);
814 return pref_stores; 815 return pref_stores;
815 } 816 }
816 817
817 } // namespace chrome 818 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/policy/arc_policy_bridge_unittest.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698