| Index: mash/app_driver/app_driver.cc
|
| diff --git a/mash/app_driver/app_driver.cc b/mash/app_driver/app_driver.cc
|
| index 008506d5d2ad78ee3479fd44afee611261979ecc..d93aaf30bb4671cb3ba1a3a3e0b6d1fed8fa6998 100644
|
| --- a/mash/app_driver/app_driver.cc
|
| +++ b/mash/app_driver/app_driver.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2015 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -21,6 +21,7 @@ namespace app_driver {
|
| namespace {
|
|
|
| enum class Accelerator : uint32_t {
|
| + EnableTouchHud,
|
| NewChromeWindow,
|
| NewChromeTab,
|
| NewChromeIncognitoWindow,
|
| @@ -36,6 +37,8 @@ struct AcceleratorSpec {
|
| };
|
|
|
| AcceleratorSpec g_spec[] = {
|
| + {Accelerator::EnableTouchHud, ui::mojom::KeyboardCode::P,
|
| + ui::mojom::kEventFlagControlDown | ui::mojom::kEventFlagAltDown},
|
| {Accelerator::NewChromeWindow, ui::mojom::KeyboardCode::N,
|
| ui::mojom::kEventFlagControlDown},
|
| {Accelerator::NewChromeTab, ui::mojom::KeyboardCode::T,
|
| @@ -110,6 +113,8 @@ void AppDriver::OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) {
|
| };
|
|
|
| std::map<Accelerator, LaunchOptions> options{
|
| + {Accelerator::EnableTouchHud,
|
| + {mojom::kWindow, "mojo:touch_hud", LaunchMode::DEFAULT}},
|
| {Accelerator::NewChromeWindow,
|
| {mojom::kWindow, "exe:chrome", LaunchMode::MAKE_NEW}},
|
| {Accelerator::NewChromeTab,
|
|
|