chrome/common/pref_names.cc - Issue 1839223003: Add basic Chrome interaction with the mash shelf.

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/common/pref_names.cc

Issue 1839223003: Add basic Chrome interaction with the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move chrome_launcher_prefs from ash to aura. Created 4 years, 8 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/common/pref_names.cc

diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc

index 3c1ee55646abc61a65ddcf046ca6e2cb491feaa0..877cf3410fac8f777ba9abfc85e6ead3258c6b6a 100644

--- a/chrome/common/pref_names.cc

+++ b/chrome/common/pref_names.cc

@@ -1995,7 +1995,7 @@ const char kMediaGalleriesRememberedGalleries[] =

"media_galleries.remembered_galleries";

#endif // !defined(OS_ANDROID)

-#if defined(USE_ASH)

+#if defined(USE_AURA)

// |kShelfAlignment| and |kShelfAutoHideBehavior| have a local variant. The

// local variant is not synced and is used if set. If the local variant is not

// set its value is set from the synced value (once prefs have been