OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/ui/ash/chrome_launcher_prefs.h" | 5 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/common/extensions/extension_constants.h" | 10 #include "chrome/common/extensions/extension_constants.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 prefs::kShelfAutoHideBehaviorLocal, | 61 prefs::kShelfAutoHideBehaviorLocal, |
62 std::string(), | 62 std::string(), |
63 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 63 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
64 registry->RegisterStringPref(prefs::kShelfAlignment, | 64 registry->RegisterStringPref(prefs::kShelfAlignment, |
65 kShelfAlignmentBottom, | 65 kShelfAlignmentBottom, |
66 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 66 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
67 registry->RegisterStringPref( | 67 registry->RegisterStringPref( |
68 prefs::kShelfAlignmentLocal, | 68 prefs::kShelfAlignmentLocal, |
69 std::string(), | 69 std::string(), |
70 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 70 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 71 registry->RegisterDictionaryPref( |
| 72 prefs::kShelfPreferences, |
| 73 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 74 registry->RegisterIntegerPref( |
| 75 prefs::kLogoutDialogDurationMs, |
| 76 20000, |
| 77 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
71 registry->RegisterBooleanPref( | 78 registry->RegisterBooleanPref( |
72 prefs::kShowLogoutButtonInTray, | 79 prefs::kShowLogoutButtonInTray, |
73 false, | 80 false, |
74 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 81 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
75 registry->RegisterDictionaryPref( | |
76 prefs::kShelfPreferences, | |
77 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
78 } | 82 } |
79 | 83 |
80 base::DictionaryValue* CreateAppDict(const std::string& app_id) { | 84 base::DictionaryValue* CreateAppDict(const std::string& app_id) { |
81 scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue); | 85 scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue); |
82 app_value->SetString(kPinnedAppsPrefAppIDPath, app_id); | 86 app_value->SetString(kPinnedAppsPrefAppIDPath, app_id); |
83 return app_value.release(); | 87 return app_value.release(); |
84 } | 88 } |
85 | 89 |
86 } // namespace ash | 90 } // namespace ash |
OLD | NEW |