Index: chrome/common/pref_names.cc |
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc |
index 9434e817c2139774695c9c7949086b1d6f1ae060..65659535afcdf45fba2298966892f9a53067e62b 100644 |
--- a/chrome/common/pref_names.cc |
+++ b/chrome/common/pref_names.cc |
@@ -2024,11 +2024,17 @@ const char kMediaGalleriesRememberedGalleries[] = |
"media_galleries.remembered_galleries"; |
#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 |
+// synced). This gives a per-machine setting that is initialized from the last |
+// set value. |
// String value corresponding to ash::Shell::ShelfAlignment. |
const char kShelfAlignment[] = "shelf_alignment"; |
+const char kShelfAlignmentLocal[] = "shelf_alignment_local"; |
// String value corresponding to ash::Shell::ShelfAutoHideBehavior. |
-const char kShelfAutoHideBehavior[] = |
- "auto_hide_behavior"; |
+const char kShelfAutoHideBehavior[] = "auto_hide_behavior"; |
+const char kShelfAutoHideBehaviorLocal[] = "auto_hide_behavior_local"; |
// Boolean value indicating whether to use default pinned apps. |
const char kUseDefaultPinnedApps[] = "use_default_pinned_apps"; |
const char kPinnedLauncherApps[] = |