2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index c20b9ba..7bc0ca6 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -2103,6 +2103,8 @@ const char kMediaGalleriesRememberedGalleries[] =
 // set its value is set from the synced value (once prefs have been
 // synced). This gives a per-machine setting that is initialized from the last
 // set value.
+// These values are default on the machine but can be overridden by per-display
+// values in kShelfPreferences (unless overridden by managed policy).
 // String value corresponding to ash::Shell::ShelfAlignment.
 const char kShelfAlignment[] = "shelf_alignment";
 const char kShelfAlignmentLocal[] = "shelf_alignment_local";
@@ -2112,6 +2114,11 @@ const char kShelfAutoHideBehaviorLocal[] = "auto_hide_behavior_local";
 const char kPinnedLauncherApps[] = "pinned_launcher_apps";
 // Boolean value indicating whether to show a logout button in the ash tray.
 const char kShowLogoutButtonInTray[] = "show_logout_button_in_tray";
+// Dictionary value that holds per-display preference of shelf alignment and
+// auto-hide behavior. Key of the dictionary is the id of the display, and
+// its value is a dictionary whose keys are kShelfAlignment and
+// kShelfAutoHideBehavior.
+const char kShelfPreferences[] = "shelf_preferences";
 
 const char kFlingVelocityCap[] = "gesture.fling_velocity_cap";
 const char kLongPressTimeInSeconds[] =
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 572e06a..c2a6648 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -766,6 +766,7 @@ extern const char kShelfAutoHideBehavior[];
 extern const char kShelfAutoHideBehaviorLocal[];
 extern const char kPinnedLauncherApps[];
 extern const char kShowLogoutButtonInTray[];
+extern const char kShelfPreferences[];
 
 extern const char kFlingVelocityCap[];
 extern const char kLongPressTimeInSeconds[];