Add basic Chrome interaction with the mash shelf.

chrome/common/pref_names.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/pref_names.h"
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/common/pref_font_webkit_names.h"
 
@@ skipping 1977 matching lines @@
 
 // The next media gallery ID to assign.
 const char kMediaGalleriesUniqueId[] = "media_galleries.gallery_id";
 
 // A list of dictionaries, where each dictionary represents a known media
 // gallery.
 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
 // 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";
@@ skipping 190 matching lines @@
 const char kMediaRouterEnableCloudServices[] =
     "media_router.cloudservices.enabled";
 #endif  // defined(GOOGLE_CHROME_BUILD)
 // Whether or not the Media Router first run flow has been acknowledged by the
 // user.
 const char kMediaRouterFirstRunFlowAcknowledged[] =
     "media_router.firstrunflow.acknowledged";
 #endif
 
 }  // namespace prefs