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

Side by Side Diff: mash/wm/window_manager_application.cc

Issue 1878893002: Move //mojo/services tracing & catalog to //services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@63move
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/wm/window_manager_application.h ('k') | media/mojo/interfaces/mojo_bindings.gyp » ('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/wm/window_manager_application.h" 5 #include "mash/wm/window_manager_application.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "components/mus/public/cpp/event_matcher.h" 11 #include "components/mus/public/cpp/event_matcher.h"
12 #include "components/mus/public/cpp/window.h" 12 #include "components/mus/public/cpp/window.h"
13 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" 13 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
14 #include "mash/wm/accelerator_registrar_impl.h" 14 #include "mash/wm/accelerator_registrar_impl.h"
15 #include "mash/wm/root_window_controller.h" 15 #include "mash/wm/root_window_controller.h"
16 #include "mash/wm/root_windows_observer.h" 16 #include "mash/wm/root_windows_observer.h"
17 #include "mash/wm/user_window_controller_impl.h" 17 #include "mash/wm/user_window_controller_impl.h"
18 #include "mojo/converters/input_events/input_events_type_converters.h" 18 #include "mojo/converters/input_events/input_events_type_converters.h"
19 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
20 #include "services/shell/public/cpp/connection.h" 19 #include "services/shell/public/cpp/connection.h"
21 #include "services/shell/public/cpp/connector.h" 20 #include "services/shell/public/cpp/connector.h"
21 #include "services/tracing/public/cpp/tracing_impl.h"
22 #include "ui/events/event.h" 22 #include "ui/events/event.h"
23 #include "ui/mojo/init/ui_init.h" 23 #include "ui/mojo/init/ui_init.h"
24 #include "ui/views/mus/aura_init.h" 24 #include "ui/views/mus/aura_init.h"
25 #include "ui/views/mus/display_converter.h" 25 #include "ui/views/mus/display_converter.h"
26 26
27 namespace mash { 27 namespace mash {
28 namespace wm { 28 namespace wm {
29 29
30 WindowManagerApplication::WindowManagerApplication() 30 WindowManagerApplication::WindowManagerApplication()
31 : connector_(nullptr), window_manager_factory_binding_(this) {} 31 : connector_(nullptr), window_manager_factory_binding_(this) {}
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 161
162 void WindowManagerApplication::CreateWindowManager( 162 void WindowManagerApplication::CreateWindowManager(
163 mus::mojom::DisplayPtr display, 163 mus::mojom::DisplayPtr display,
164 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) { 164 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) {
165 root_controllers_.insert(RootWindowController::CreateFromDisplay( 165 root_controllers_.insert(RootWindowController::CreateFromDisplay(
166 this, std::move(display), std::move(client_request))); 166 this, std::move(display), std::move(client_request)));
167 } 167 }
168 168
169 } // namespace wm 169 } // namespace wm
170 } // namespace mash 170 } // namespace mash
OLDNEW
« no previous file with comments | « mash/wm/window_manager_application.h ('k') | media/mojo/interfaces/mojo_bindings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698