| Index: ash/wm/power_button_controller.cc
|
| diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc
|
| index 9ea85af9688d4384cadcfba8d1538db73de06d38..8038dec9773b09ea2cff8642cdfad5d6debaad7e 100644
|
| --- a/ash/wm/power_button_controller.cc
|
| +++ b/ash/wm/power_button_controller.cc
|
| @@ -45,7 +45,9 @@ PowerButtonController::PowerButtonController(LockStateController* controller)
|
| chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
|
| this);
|
| if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kAshEnableTabletPowerButton)) {
|
| + switches::kAshEnableTouchView) ||
|
| + base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAshEnableTouchViewTesting)) {
|
| tablet_controller_.reset(
|
| new TabletPowerButtonController(lock_state_controller_));
|
| }
|
|
|