| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 registry->RegisterIntegerPref( | 50 registry->RegisterIntegerPref( |
| 51 prefs::kShelfChromeIconIndex, | 51 prefs::kShelfChromeIconIndex, |
| 52 0, | 52 0, |
| 53 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 53 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 54 registry->RegisterListPref(prefs::kPinnedLauncherApps, | 54 registry->RegisterListPref(prefs::kPinnedLauncherApps, |
| 55 CreateDefaultPinnedAppsList(), | 55 CreateDefaultPinnedAppsList(), |
| 56 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 56 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 57 registry->RegisterStringPref(prefs::kShelfAutoHideBehavior, | 57 registry->RegisterStringPref(prefs::kShelfAutoHideBehavior, |
| 58 kShelfAutoHideBehaviorNever, | 58 kShelfAutoHideBehaviorNever, |
| 59 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 59 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 60 registry->RegisterStringPref( | 60 registry->RegisterStringPref(prefs::kShelfAutoHideBehaviorLocal, |
| 61 prefs::kShelfAutoHideBehaviorLocal, | 61 std::string()); |
| 62 std::string(), | |
| 63 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
| 64 registry->RegisterStringPref(prefs::kShelfAlignment, | 62 registry->RegisterStringPref(prefs::kShelfAlignment, |
| 65 kShelfAlignmentBottom, | 63 kShelfAlignmentBottom, |
| 66 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 64 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 67 registry->RegisterStringPref( | 65 registry->RegisterStringPref(prefs::kShelfAlignmentLocal, std::string()); |
| 68 prefs::kShelfAlignmentLocal, | 66 registry->RegisterDictionaryPref(prefs::kShelfPreferences); |
| 69 std::string(), | 67 registry->RegisterIntegerPref(prefs::kLogoutDialogDurationMs, 20000); |
| 70 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 68 registry->RegisterBooleanPref(prefs::kShowLogoutButtonInTray, false); |
| 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); | |
| 78 registry->RegisterBooleanPref( | |
| 79 prefs::kShowLogoutButtonInTray, | |
| 80 false, | |
| 81 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
| 82 } | 69 } |
| 83 | 70 |
| 84 base::DictionaryValue* CreateAppDict(const std::string& app_id) { | 71 base::DictionaryValue* CreateAppDict(const std::string& app_id) { |
| 85 scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue); | 72 scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue); |
| 86 app_value->SetString(kPinnedAppsPrefAppIDPath, app_id); | 73 app_value->SetString(kPinnedAppsPrefAppIDPath, app_id); |
| 87 return app_value.release(); | 74 return app_value.release(); |
| 88 } | 75 } |
| 89 | 76 |
| 90 } // namespace ash | 77 } // namespace ash |
| OLD | NEW |