Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Side by Side Diff: ash/mus/accelerators/accelerator_registrar_unittest.cc

Issue 2419063003: Move services/shell to services/service_manager (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdint.h> 5 #include <stdint.h>
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "mojo/public/cpp/bindings/binding.h" 12 #include "mojo/public/cpp/bindings/binding.h"
13 #include "services/shell/public/cpp/service_test.h" 13 #include "services/service_manager/public/cpp/service_test.h"
14 #include "services/ui/common/event_matcher_util.h" 14 #include "services/ui/common/event_matcher_util.h"
15 #include "services/ui/public/cpp/window.h" 15 #include "services/ui/public/cpp/window.h"
16 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h" 16 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
17 17
18 using ui::mojom::AcceleratorHandler; 18 using ui::mojom::AcceleratorHandler;
19 using ui::mojom::AcceleratorHandlerPtr; 19 using ui::mojom::AcceleratorHandlerPtr;
20 using ui::mojom::AcceleratorRegistrar; 20 using ui::mojom::AcceleratorRegistrar;
21 using ui::mojom::AcceleratorRegistrarPtr; 21 using ui::mojom::AcceleratorRegistrarPtr;
22 22
23 namespace ash { 23 namespace ash {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N, 110 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
111 ui::mojom::kEventFlagShiftDown))); 111 ui::mojom::kEventFlagShiftDown)));
112 EXPECT_FALSE(handler_second.AttemptToInstallAccelerator( 112 EXPECT_FALSE(handler_second.AttemptToInstallAccelerator(
113 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N, 113 3, ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
114 ui::mojom::kEventFlagShiftDown))); 114 ui::mojom::kEventFlagShiftDown)));
115 */ 115 */
116 } 116 }
117 117
118 } // namespace mus 118 } // namespace mus
119 } // namespace ash 119 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_delegate_mus.h ('k') | ash/mus/accessibility_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698