| Index: ash/ash_switches.cc
|
| diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
|
| index 004876de74c18793235ff3e0e1d74e40b359ecd4..3892ca010393c2fbcde0e62e66ed25da2b4cc7d7 100644
|
| --- a/ash/ash_switches.cc
|
| +++ b/ash/ash_switches.cc
|
| @@ -181,6 +181,10 @@ const char kHideShelfAlignmentMenu[] = "hide-launcher-alignment-menu";
|
| const char kAshUseFirstDisplayAsInternal[] =
|
| "ash-use-first-display-as-internal";
|
|
|
| +// Use the same window frame for hosted and packaged apps.
|
| +const char kAshUseSameFrameForV1AndV2Apps[] =
|
| + "ash-use-same-frame-for-v1-and-v2-apps";
|
| +
|
| // (Most) Chrome OS hardware reports ACPI power button releases correctly.
|
| // Standard hardware reports releases immediately after presses. If set, we
|
| // lock the screen or shutdown the system immediately in response to a press
|
| @@ -217,6 +221,11 @@ bool UseDragOffShelf() {
|
| HasSwitch(kAshDisableDragOffShelf);
|
| }
|
|
|
| +bool UseSameFrameForV1AndV2Apps() {
|
| + return CommandLine::ForCurrentProcess()->
|
| + HasSwitch(kAshUseSameFrameForV1AndV2Apps);
|
| +}
|
| +
|
| bool ShowShelfAlignmentMenu() {
|
| return !CommandLine::ForCurrentProcess()->
|
| HasSwitch(kHideShelfAlignmentMenu);
|
|
|