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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: services/ui/mus_app.cc

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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 | « services/ui/mus_app.h ('k') | services/ui/public/cpp/BUILD.gn » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/mus/mus_app.h" 5 #include "services/ui/mus_app.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/threading/platform_thread.h" 13 #include "base/threading/platform_thread.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "components/mus/clipboard/clipboard_impl.h"
16 #include "components/mus/common/switches.h"
17 #include "components/mus/gles2/gpu_impl.h"
18 #include "components/mus/gpu/gpu_service_impl.h"
19 #include "components/mus/gpu/gpu_service_mus.h"
20 #include "components/mus/ws/display.h"
21 #include "components/mus/ws/display_binding.h"
22 #include "components/mus/ws/display_manager.h"
23 #include "components/mus/ws/platform_screen.h"
24 #include "components/mus/ws/user_activity_monitor.h"
25 #include "components/mus/ws/user_display_manager.h"
26 #include "components/mus/ws/window_server.h"
27 #include "components/mus/ws/window_server_test_impl.h"
28 #include "components/mus/ws/window_tree.h"
29 #include "components/mus/ws/window_tree_binding.h"
30 #include "components/mus/ws/window_tree_factory.h"
31 #include "components/mus/ws/window_tree_host_factory.h"
32 #include "mojo/public/c/system/main.h" 15 #include "mojo/public/c/system/main.h"
33 #include "services/catalog/public/cpp/resource_loader.h" 16 #include "services/catalog/public/cpp/resource_loader.h"
34 #include "services/shell/public/cpp/connection.h" 17 #include "services/shell/public/cpp/connection.h"
35 #include "services/shell/public/cpp/connector.h" 18 #include "services/shell/public/cpp/connector.h"
36 #include "services/tracing/public/cpp/tracing_impl.h" 19 #include "services/tracing/public/cpp/tracing_impl.h"
20 #include "services/ui/clipboard/clipboard_impl.h"
21 #include "services/ui/common/switches.h"
22 #include "services/ui/gles2/gpu_impl.h"
23 #include "services/ui/gpu/gpu_service_impl.h"
24 #include "services/ui/gpu/gpu_service_mus.h"
25 #include "services/ui/ws/display.h"
26 #include "services/ui/ws/display_binding.h"
27 #include "services/ui/ws/display_manager.h"
28 #include "services/ui/ws/platform_screen.h"
29 #include "services/ui/ws/user_activity_monitor.h"
30 #include "services/ui/ws/user_display_manager.h"
31 #include "services/ui/ws/window_server.h"
32 #include "services/ui/ws/window_server_test_impl.h"
33 #include "services/ui/ws/window_tree.h"
34 #include "services/ui/ws/window_tree_binding.h"
35 #include "services/ui/ws/window_tree_factory.h"
36 #include "services/ui/ws/window_tree_host_factory.h"
37 #include "ui/base/resource/resource_bundle.h" 37 #include "ui/base/resource/resource_bundle.h"
38 #include "ui/base/ui_base_paths.h" 38 #include "ui/base/ui_base_paths.h"
39 #include "ui/events/event_switches.h" 39 #include "ui/events/event_switches.h"
40 #include "ui/events/platform/platform_event_source.h" 40 #include "ui/events/platform/platform_event_source.h"
41 #include "ui/gfx/geometry/rect.h" 41 #include "ui/gfx/geometry/rect.h"
42 #include "ui/gl/gl_surface.h" 42 #include "ui/gl/gl_surface.h"
43 43
44 #if defined(USE_X11) 44 #if defined(USE_X11)
45 #include <X11/Xlib.h> 45 #include <X11/Xlib.h>
46 #include "ui/platform_window/x11/x11_window.h" 46 #include "ui/platform_window/x11/x11_window.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 // Display manages its own lifetime. 379 // Display manages its own lifetime.
380 ws::Display* host_impl = 380 ws::Display* host_impl =
381 new ws::Display(window_server_.get(), platform_display_init_params_); 381 new ws::Display(window_server_.get(), platform_display_init_params_);
382 host_impl->Init(nullptr); 382 host_impl->Init(nullptr);
383 383
384 if (touch_controller_) 384 if (touch_controller_)
385 touch_controller_->UpdateTouchTransforms(); 385 touch_controller_->UpdateTouchTransforms();
386 } 386 }
387 387
388 } // namespace mus 388 } // namespace mus
OLDNEW
« no previous file with comments | « services/ui/mus_app.h ('k') | services/ui/public/cpp/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698