Add basic Chrome interaction with the mash shelf.

chrome/common/pref_names.h

 // 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.
 
 // Constants for the names of various preferences, for easier changing.
 
 #ifndef CHROME_COMMON_PREF_NAMES_H_
 #define CHROME_COMMON_PREF_NAMES_H_
 
 #include <stddef.h>
@@ skipping 685 matching lines @@
 extern const char kSystemTimezoneAutomaticDetectionPolicy[];
 #endif  // defined(OS_CHROMEOS)
 
 #if !defined(OS_ANDROID)
 extern const char kAttemptedToEnableAutoupdate[];
 
 extern const char kMediaGalleriesUniqueId[];
 extern const char kMediaGalleriesRememberedGalleries[];
 #endif  // !defined(OS_ANDROID)
 
-#if defined(USE_ASH)
+#if defined(USE_AURA)

[James Cook, 2016/04/06 04:29:52]

Possibly silly drive-by question: Why does all this need to move into USE_AURA
instead of living in USE_ASH? I see the source files moving between groups in
gyp/gn, but I don't understand why. Why does chrome_mash_shelf_controller.cc
compile using USE_AURA but not USE_ASH? I must have missed something. Maybe I've
forgotten how USE_AURA and USE_ASH interact.

[msw, 2016/04/07 20:34:57]

afaik, we want to be able to build mash w/o USE_ASH for ease of development.
I think we to remove USE_ASH and just rely on OS_CHROMEOS and runtime flags.

 extern const char kShelfAlignment[];
 extern const char kShelfAlignmentLocal[];
 extern const char kShelfAutoHideBehavior[];
 extern const char kShelfAutoHideBehaviorLocal[];
 extern const char kShelfChromeIconIndex[];
 extern const char kShelfPreferences[];
 
 extern const char kLogoutDialogDurationMs[];
 extern const char kPinnedLauncherApps[];
 extern const char kPolicyPinnedLauncherApps[];
 extern const char kShowLogoutButtonInTray[];
-#endif
 
-#if defined(USE_AURA)
 extern const char kMaxSeparationForGestureTouchesInPixels[];
 extern const char kSemiLongPressTimeInMs[];
 extern const char kTabScrubActivationDelayInMs[];
 extern const char kFlingMaxCancelToDownTimeInMs[];
 extern const char kFlingMaxTapGapTimeInMs[];
 extern const char kOverscrollHorizontalThresholdComplete[];
 extern const char kOverscrollVerticalThresholdComplete[];
 extern const char kOverscrollMinimumThresholdStart[];
 extern const char kOverscrollMinimumThresholdStartTouchpad[];
 extern const char kOverscrollVerticalThresholdStart[];
@@ skipping 75 matching lines @@
 #if defined(GOOGLE_CHROME_BUILD)
 extern const char kMediaRouterCloudServicesPrefSet[];
 extern const char kMediaRouterEnableCloudServices[];
 #endif  // defined(GOOGLE_CHROME_BUILD)
 extern const char kMediaRouterFirstRunFlowAcknowledged[];
 #endif
 
 }  // namespace prefs
 
 #endif  // CHROME_COMMON_PREF_NAMES_H_