chrome/browser/ui/ash/chrome_launcher_prefs.cc - Issue 40053002: Implements the dialog view for logout button tray in public sessions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: more fixes; make delegate pure; add ShowDialog() to delegate(); add TODO in tests 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 side-by-side diff with in-line comments

Download patch

« ash/system/logout_button/logout_confirmation_dialog_view.h ('K') | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/chrome_launcher_prefs.cc

diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.cc b/chrome/browser/ui/ash/chrome_launcher_prefs.cc

index 87c923ceddb8e62fa88105b096ff89afbbaab8da..b02441e1d1b1c8e4ec469668e07d252a64936bab 100644

--- a/chrome/browser/ui/ash/chrome_launcher_prefs.cc

+++ b/chrome/browser/ui/ash/chrome_launcher_prefs.cc

@@ -68,13 +68,17 @@ void RegisterChromeLauncherUserPrefs(

prefs::kShelfAlignmentLocal,

std::string(),

user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterDictionaryPref(

+ prefs::kShelfPreferences,

+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterIntegerPref(

+ prefs::kLogoutDialogDurationMs,

+ 20000,

+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

registry->RegisterBooleanPref(

prefs::kShowLogoutButtonInTray,

false,

user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

- registry->RegisterDictionaryPref(

- prefs::kShelfPreferences,

- user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

}

base::DictionaryValue* CreateAppDict(const std::string& app_id) {