| Index: ash/ash_switches.h
|
| diff --git a/ash/ash_switches.h b/ash/ash_switches.h
|
| index 006b8dc82a6b462e7a9b97fda30154dde15d7b26..3e6f59106e40c55462130a1984c182e961e2bebf 100644
|
| --- a/ash/ash_switches.h
|
| +++ b/ash/ash_switches.h
|
| @@ -68,6 +68,7 @@ ASH_EXPORT extern const char kAshSecondaryDisplayLayout[];
|
| ASH_EXPORT extern const char kAshTouchHud[];
|
| ASH_EXPORT extern const char kAshUseAlternateShelfLayout[];
|
| ASH_EXPORT extern const char kAshUseFirstDisplayAsInternal[];
|
| +ASH_EXPORT extern const char kAshUseSameFrameForV1AndV2Apps[];
|
| ASH_EXPORT extern const char kAuraLegacyPowerButton[];
|
| #if defined(OS_WIN)
|
| ASH_EXPORT extern const char kForceAshToDesktop[];
|
| @@ -87,6 +88,10 @@ ASH_EXPORT bool UseAlternateShelfLayout();
|
| // Returns true if items can be dragged off the shelf to unpin.
|
| ASH_EXPORT bool UseDragOffShelf();
|
|
|
| +// Returns true if the same window frame should be used for hosted and packaged
|
| +// apps.
|
| +ASH_EXPORT bool UseSameFrameForV1AndV2Apps();
|
| +
|
| // Returns true if side shelf alignment is enabled.
|
| ASH_EXPORT bool ShowShelfAlignmentMenu();
|
|
|
|
|