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

Side by Side Diff: chrome/browser/ui/ash/chrome_launcher_prefs.cc

Issue 40053002: Implements the dialog view for logout button tray in public sessions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor improvement on comments Created 7 years 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 (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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 kShelfAlignmentBottom, 76 kShelfAlignmentBottom,
77 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 77 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
78 registry->RegisterStringPref( 78 registry->RegisterStringPref(
79 prefs::kShelfAlignmentLocal, 79 prefs::kShelfAlignmentLocal,
80 std::string(), 80 std::string(),
81 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 81 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
82 registry->RegisterBooleanPref( 82 registry->RegisterBooleanPref(
83 prefs::kShowLogoutButtonInTray, 83 prefs::kShowLogoutButtonInTray,
84 false, 84 false,
85 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 85 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
86 registry->RegisterIntegerPref(
87 prefs::kLogoutDialogDurationMs,
88 20000,
89 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
86 registry->RegisterDictionaryPref( 90 registry->RegisterDictionaryPref(
87 prefs::kShelfPreferences, 91 prefs::kShelfPreferences,
88 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 92 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
89 } 93 }
90 94
91 base::DictionaryValue* CreateAppDict(const std::string& app_id) { 95 base::DictionaryValue* CreateAppDict(const std::string& app_id) {
92 scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue); 96 scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue);
93 app_value->SetString(kPinnedAppsPrefAppIDPath, app_id); 97 app_value->SetString(kPinnedAppsPrefAppIDPath, app_id);
94 return app_value.release(); 98 return app_value.release();
95 } 99 }
96 100
97 } // namespace ash 101 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698