OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/chromeos/user_cros_settings_provider.h" | 5 #include "chrome/browser/chromeos/user_cros_settings_provider.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/hash_tables.h" | 10 #include "base/hash_tables.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 // true is default permissive value and false is safe prohibitic value. | 37 // true is default permissive value and false is safe prohibitic value. |
38 // Exception: kSignedDataRoamingEnabled which has default value of false. | 38 // Exception: kSignedDataRoamingEnabled which has default value of false. |
39 const char* kBooleanSettings[] = { | 39 const char* kBooleanSettings[] = { |
40 kAccountsPrefAllowNewUser, | 40 kAccountsPrefAllowNewUser, |
41 kAccountsPrefAllowGuest, | 41 kAccountsPrefAllowGuest, |
42 kAccountsPrefShowUserNamesOnSignIn, | 42 kAccountsPrefShowUserNamesOnSignIn, |
43 kSignedDataRoamingEnabled, | 43 kSignedDataRoamingEnabled, |
44 }; | 44 }; |
45 | 45 |
46 const char* kStringSettings[] = { | 46 const char* kStringSettings[] = { |
47 kDeviceOwner | 47 kDeviceOwner, |
| 48 kReleaseChannel |
48 }; | 49 }; |
49 | 50 |
50 const char* kListSettings[] = { | 51 const char* kListSettings[] = { |
51 kAccountsPrefUsers | 52 kAccountsPrefUsers |
52 }; | 53 }; |
53 | 54 |
54 bool IsControlledBooleanSetting(const std::string& pref_path) { | 55 bool IsControlledBooleanSetting(const std::string& pref_path) { |
55 // TODO(nkostylev): Using std::find for 4 value array generates this warning | 56 // TODO(nkostylev): Using std::find for 4 value array generates this warning |
56 // in chroot stl_algo.h:231: error: array subscript is above array bounds. | 57 // in chroot stl_algo.h:231: error: array subscript is above array bounds. |
57 // GCC 4.4.3 | 58 // GCC 4.4.3 |
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
601 if (cached_whitelist_update->Remove(email_value) != -1) | 602 if (cached_whitelist_update->Remove(email_value) != -1) |
602 prefs->ScheduleSavePersistentPrefs(); | 603 prefs->ScheduleSavePersistentPrefs(); |
603 } | 604 } |
604 | 605 |
605 // static | 606 // static |
606 void UserCrosSettingsProvider::UpdateCachedOwner(const std::string& email) { | 607 void UserCrosSettingsProvider::UpdateCachedOwner(const std::string& email) { |
607 UpdateCacheString(kDeviceOwner, email, USE_VALUE_SUPPLIED); | 608 UpdateCacheString(kDeviceOwner, email, USE_VALUE_SUPPLIED); |
608 } | 609 } |
609 | 610 |
610 } // namespace chromeos | 611 } // namespace chromeos |
OLD | NEW |