Reorganize event mojom files.

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"
@@ skipping 11 matching lines @@
 
 enum class Accelerator : uint32_t {
   NewChromeWindow,
   NewChromeTab,
   NewChromeIncognitoWindow,
   ShowTaskManager,
 };
 
 struct AcceleratorSpec {
   Accelerator id;
-  mus::mojom::KeyboardCode keyboard_code;
+  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, mus::mojom::KeyboardCode::N,
-     mus::mojom::kEventFlagControlDown},
-    {Accelerator::NewChromeTab, mus::mojom::KeyboardCode::T,
-     mus::mojom::kEventFlagControlDown},
-    {Accelerator::NewChromeIncognitoWindow, mus::mojom::KeyboardCode::N,
-     mus::mojom::kEventFlagControlDown | mus::mojom::kEventFlagShiftDown},
-    {Accelerator::ShowTaskManager, mus::mojom::KeyboardCode::ESCAPE,
-     mus::mojom::kEventFlagShiftDown},
+    {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},
 };
 
 void AssertTrue(bool success) {
   DCHECK(success);
 }
 
 void DoNothing() {}
 
 }  // namespace
 
@@ skipping 73 matching lines @@
 
 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