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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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 fix 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

« ash/system/logout_button/logout_confirmation_dialog_view.cc ('K') | « chrome/browser/chromeos/system/ash_system_tray_delegate.cc ('k') | chrome/common/pref_names.h » ('j') | chrome/common/pref_names.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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->RegisterBooleanPref(	71 registry->RegisterBooleanPref(

72 prefs::kShowLogoutButtonInTray,	72 prefs::kShowLogoutButtonInTray,

73 false,	73 false,

74 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);	74 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

	75 registry->RegisterIntegerPref(
	Daniel Erat 2013/12/18 20:25:41 nit: not your fault, but mind alphabetizing these nit: not your fault, but mind alphabetizing these by pref name? the order seems arbitrary right now. binjin 2013/12/19 16:30:39 Done. Show quoted text On 2013/12/18 20:25:41, Daniel Erat wrote: > nit: not your fault, but mind alphabetizing these by pref name? the order seems > arbitrary right now. Done.
	76 prefs::kLogoutDialogDurationMs,

	77 20000,

	78 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

75 registry->RegisterDictionaryPref(	79 registry->RegisterDictionaryPref(

76 prefs::kShelfPreferences,	80 prefs::kShelfPreferences,

77 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);	81 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