| Index: ash/ash_switches.h
|
| diff --git a/ash/ash_switches.h b/ash/ash_switches.h
|
| index 339226db83e5de662b5c0819c9d3bad859c471a0..d12a3d011488089b58917917a52f4cb6cf933414 100644
|
| --- a/ash/ash_switches.h
|
| +++ b/ash/ash_switches.h
|
| @@ -67,6 +67,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[];
|
| @@ -86,6 +87,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();
|
|
|
|
|