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

Side by Side Diff: mash/browser_driver/browser_driver_application_delegate.cc

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan
Patch Set: . Created 4 years, 8 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
« no previous file with comments | « mash/browser_driver/browser_driver_application_delegate.h ('k') | mash/browser_driver/main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "mash/browser_driver/browser_driver_application_delegate.h" 5 #include "mash/browser_driver/browser_driver_application_delegate.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "components/mus/public/cpp/event_matcher.h" 11 #include "components/mus/public/cpp/event_matcher.h"
12 #include "mojo/shell/public/cpp/connection.h" 12 #include "services/shell/public/cpp/connection.h"
13 #include "mojo/shell/public/cpp/connector.h" 13 #include "services/shell/public/cpp/connector.h"
14 14
15 namespace mash { 15 namespace mash {
16 namespace browser_driver { 16 namespace browser_driver {
17 namespace { 17 namespace {
18 18
19 enum class Accelerator : uint32_t { 19 enum class Accelerator : uint32_t {
20 NewWindow, 20 NewWindow,
21 NewTab, 21 NewTab,
22 NewIncognitoWindow, 22 NewIncognitoWindow,
23 }; 23 };
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 for (const AcceleratorSpec& spec : g_spec) { 107 for (const AcceleratorSpec& spec : g_spec) {
108 registrar->AddAccelerator( 108 registrar->AddAccelerator(
109 static_cast<uint32_t>(spec.id), 109 static_cast<uint32_t>(spec.id),
110 mus::CreateKeyMatcher(spec.keyboard_code, spec.event_flags), 110 mus::CreateKeyMatcher(spec.keyboard_code, spec.event_flags),
111 base::Bind(&AssertTrue)); 111 base::Bind(&AssertTrue));
112 } 112 }
113 } 113 }
114 114
115 } // namespace browser_driver 115 } // namespace browser_driver
116 } // namespace main 116 } // namespace main
OLDNEW
« no previous file with comments | « mash/browser_driver/browser_driver_application_delegate.h ('k') | mash/browser_driver/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698