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

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

Issue 1565343003: Move mojo/application/public -> mojo/shell/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fetcher
Patch Set: . Created 4 years, 11 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 "components/mus/public/cpp/event_matcher.h" 10 #include "components/mus/public/cpp/event_matcher.h"
11 #include "mojo/application/public/cpp/application_connection.h" 11 #include "mojo/shell/public/cpp/application_connection.h"
12 #include "mojo/application/public/cpp/application_impl.h" 12 #include "mojo/shell/public/cpp/application_impl.h"
13 13
14 namespace mash { 14 namespace mash {
15 namespace browser_driver { 15 namespace browser_driver {
16 namespace { 16 namespace {
17 17
18 enum class Accelerator : uint32_t { 18 enum class Accelerator : uint32_t {
19 NewWindow, 19 NewWindow,
20 NewTab, 20 NewTab,
21 NewIncognitoWindow, 21 NewIncognitoWindow,
22 }; 22 };
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 for (const AcceleratorSpec& spec : g_spec) { 98 for (const AcceleratorSpec& spec : g_spec) {
99 registrar->AddAccelerator( 99 registrar->AddAccelerator(
100 static_cast<uint32_t>(spec.id), 100 static_cast<uint32_t>(spec.id),
101 mus::CreateKeyMatcher(spec.keyboard_code, spec.event_flags), 101 mus::CreateKeyMatcher(spec.keyboard_code, spec.event_flags),
102 base::Bind(&AssertTrue)); 102 base::Bind(&AssertTrue));
103 } 103 }
104 } 104 }
105 105
106 } // namespace browser_driver 106 } // namespace browser_driver
107 } // namespace main 107 } // 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