chrome/browser/ui/ash/chrome_launcher_prefs.cc - Issue 11233049: Splits shelf alignment and auto-hide behavior into two values, one

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 11233049: Splits shelf alignment and auto-hide behavior into two values, one (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: gr! Created 8 years, 2 months ago

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

Jump to:

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 303d102c9170d3697b3ff99519d245b4097e954d..175b6d232f00992b5aa91e60132ef2dfc7170742 100644

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

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

@@ -53,9 +53,15 @@ void RegisterChromeLauncherUserPrefs(PrefService* user_prefs) {

user_prefs->RegisterStringPref(prefs::kShelfAutoHideBehavior,

kShelfAutoHideBehaviorNever,

PrefService::SYNCABLE_PREF);

+ user_prefs->RegisterStringPref(prefs::kShelfAutoHideBehaviorLocal,

+ std::string(),

+ PrefService::UNSYNCABLE_PREF);

user_prefs->RegisterStringPref(prefs::kShelfAlignment,

kShelfAlignmentBottom,

PrefService::SYNCABLE_PREF);

+ user_prefs->RegisterStringPref(prefs::kShelfAlignmentLocal,

+ std::string(),

+ PrefService::UNSYNCABLE_PREF);

user_prefs->RegisterBooleanPref(prefs::kLauncherShouldRunSyncAnimation,

true,

PrefService::UNSYNCABLE_PREF);