mash: Fix launching touch hud app in mash mode.

mash/app_driver/app_driver.cc

 // Copyright 2015 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.
 
 #include "mash/app_driver/app_driver.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/common/event_matcher_util.h"
 
 using mash::mojom::LaunchablePtr;
 using mash::mojom::LaunchMode;
 
 namespace mash {
 namespace app_driver {
 namespace {
 
 enum class Accelerator : uint32_t {
   NewChromeWindow,
   NewChromeTab,
   NewChromeIncognitoWindow,
   ShowTaskManager,
-  ToggleTouchHud,
 };
 
 struct AcceleratorSpec {
   Accelerator id;
   ui::mojom::KeyboardCode keyboard_code;
   // A bitfield of kEventFlag* and kMouseEventFlag* values in
   // input_event_constants.mojom.
   int event_flags;
 };
 
 AcceleratorSpec g_spec[] = {
     {Accelerator::NewChromeWindow, ui::mojom::KeyboardCode::N,
      ui::mojom::kEventFlagControlDown},
     {Accelerator::NewChromeTab, ui::mojom::KeyboardCode::T,
      ui::mojom::kEventFlagControlDown},
     {Accelerator::NewChromeIncognitoWindow, ui::mojom::KeyboardCode::N,
      ui::mojom::kEventFlagControlDown | ui::mojom::kEventFlagShiftDown},
     {Accelerator::ShowTaskManager, ui::mojom::KeyboardCode::ESCAPE,
      ui::mojom::kEventFlagShiftDown},
-    {Accelerator::ToggleTouchHud, ui::mojom::KeyboardCode::P,
-     ui::mojom::kEventFlagControlDown | ui::mojom::kEventFlagAltDown},
 };
 
 void AssertTrue(bool success) {
   DCHECK(success);
 }
 
 void DoNothing() {}
 
 }  // namespace
 
@@ skipping 52 matching lines @@
 
   std::map<Accelerator, LaunchOptions> options{
       {Accelerator::NewChromeWindow,
        {mojom::kWindow, "exe:chrome", LaunchMode::MAKE_NEW}},
       {Accelerator::NewChromeTab,
        {mojom::kDocument, "exe:chrome", LaunchMode::MAKE_NEW}},
       {Accelerator::NewChromeIncognitoWindow,
        {mojom::kIncognitoWindow, "exe:chrome", LaunchMode::MAKE_NEW}},
       {Accelerator::ShowTaskManager,
        {mojom::kWindow, "mojo:task_viewer", LaunchMode::DEFAULT}},
-      {Accelerator::ToggleTouchHud,
-       {mojom::kWindow, "mojo:touch_hud", LaunchMode::DEFAULT}},
   };
 
   const auto iter = options.find(static_cast<Accelerator>(id));
   DCHECK(iter != options.end());
   const LaunchOptions& entry = iter->second;
   LaunchablePtr launchable;
   connector()->ConnectToInterface(entry.app, &launchable);
   launchable->Launch(entry.option, entry.mode);
 }
 
 void AppDriver::AddAccelerators() {
   connector()->ConnectToInterface("mojo:catalog", &catalog_);
   catalog_->GetEntriesProvidingClass(
       "mus:window_manager", base::Bind(&AppDriver::OnAvailableCatalogEntries,
                                        weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace app_driver
 }  // namespace mash