| Index: ash/common/ash_switches.h
|
| diff --git a/ash/common/ash_switches.h b/ash/common/ash_switches.h
|
| index c4684735394b740a5abb74e8ca6e8c06562d5ea9..fd5d57696187c466098c2fa9b8035d6c625e5e48 100644
|
| --- a/ash/common/ash_switches.h
|
| +++ b/ash/common/ash_switches.h
|
| @@ -25,9 +25,9 @@ ASH_EXPORT extern const char kAshDisableMaximizeModeWindowBackdrop[];
|
| ASH_EXPORT extern const char kAshDisableScreenOrientationLock[];
|
| ASH_EXPORT extern const char kAshDisableTouchExplorationMode[];
|
| ASH_EXPORT extern const char kAshEnableMagnifierKeyScroller[];
|
| +ASH_EXPORT extern const char kAshEnableMirroredScreen[];
|
| ASH_EXPORT extern const char kAshEnablePaletteOnAllDisplays[];
|
| ASH_EXPORT extern const char kAshEnableTouchView[];
|
| -ASH_EXPORT extern const char kAshEnableMirroredScreen[];
|
| ASH_EXPORT extern const char kAshEnableSmoothScreenRotation[];
|
| ASH_EXPORT extern const char kAshEstimatedPresentationDelay[];
|
| ASH_EXPORT extern const char kAshForceEnablePalette[];
|
| @@ -37,15 +37,15 @@ ASH_EXPORT extern const char kAshForceTabletModeClamshell[];
|
| ASH_EXPORT extern const char kAshForceTabletModeTouchView[];
|
| ASH_EXPORT extern const char kAshHideNotificationsForFactory[];
|
| ASH_EXPORT extern const char kAshShelfColor[];
|
| -ASH_EXPORT extern const char kAshShelfColorEnabled[];
|
| ASH_EXPORT extern const char kAshShelfColorDisabled[];
|
| +ASH_EXPORT extern const char kAshShelfColorEnabled[];
|
| ASH_EXPORT extern const char kAshShelfColorScheme[];
|
| +ASH_EXPORT extern const char kAshShelfColorSchemeDarkMuted[];
|
| +ASH_EXPORT extern const char kAshShelfColorSchemeDarkVibrant[];
|
| ASH_EXPORT extern const char kAshShelfColorSchemeLightMuted[];
|
| ASH_EXPORT extern const char kAshShelfColorSchemeLightVibrant[];
|
| ASH_EXPORT extern const char kAshShelfColorSchemeNormalMuted[];
|
| ASH_EXPORT extern const char kAshShelfColorSchemeNormalVibrant[];
|
| -ASH_EXPORT extern const char kAshShelfColorSchemeDarkMuted[];
|
| -ASH_EXPORT extern const char kAshShelfColorSchemeDarkVibrant[];
|
| ASH_EXPORT extern const char kAshTouchHud[];
|
| ASH_EXPORT extern const char kAuraLegacyPowerButton[];
|
|
|
|
|