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

Side by Side Diff: components/mus/mus_app.cc

Issue 1390083002: Revert of ui: Add GLImage unit test framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « components/mus/gles2/command_buffer_driver.cc ('k') | components/mus/vm/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 "components/mus/mus_app.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "components/mus/gles2/gpu_impl.h" 8 #include "components/mus/gles2/gpu_impl.h"
9 #include "components/mus/public/cpp/args.h" 9 #include "components/mus/public/cpp/args.h"
10 #include "components/mus/surfaces/surfaces_scheduler.h" 10 #include "components/mus/surfaces/surfaces_scheduler.h"
11 #include "components/mus/vm/client_connection.h" 11 #include "components/mus/vm/client_connection.h"
12 #include "components/mus/vm/connection_manager.h" 12 #include "components/mus/vm/connection_manager.h"
13 #include "components/mus/vm/view_tree_host_connection.h" 13 #include "components/mus/vm/view_tree_host_connection.h"
14 #include "components/mus/vm/view_tree_host_impl.h" 14 #include "components/mus/vm/view_tree_host_impl.h"
15 #include "components/mus/vm/view_tree_impl.h" 15 #include "components/mus/vm/view_tree_impl.h"
16 #include "mojo/application/public/cpp/application_connection.h" 16 #include "mojo/application/public/cpp/application_connection.h"
17 #include "mojo/application/public/cpp/application_impl.h" 17 #include "mojo/application/public/cpp/application_impl.h"
18 #include "mojo/application/public/cpp/application_runner.h" 18 #include "mojo/application/public/cpp/application_runner.h"
19 #include "mojo/common/tracing_impl.h" 19 #include "mojo/common/tracing_impl.h"
20 #include "third_party/mojo/src/mojo/public/c/system/main.h" 20 #include "third_party/mojo/src/mojo/public/c/system/main.h"
21 #include "ui/events/event_switches.h" 21 #include "ui/events/event_switches.h"
22 #include "ui/events/platform/platform_event_source.h" 22 #include "ui/events/platform/platform_event_source.h"
23 #include "ui/gl/gl_surface.h" 23 #include "ui/gl/gl_surface.h"
24 #include "ui/gl/test/gl_surface_test_support.h"
24 25
25 #if defined(USE_X11) 26 #if defined(USE_X11)
26 #include <X11/Xlib.h> 27 #include <X11/Xlib.h>
27 #include "base/command_line.h" 28 #include "base/command_line.h"
28 #include "ui/platform_window/x11/x11_window.h" 29 #include "ui/platform_window/x11/x11_window.h"
29 #endif 30 #endif
30 31
31 using mojo::ApplicationConnection; 32 using mojo::ApplicationConnection;
32 using mojo::ApplicationImpl; 33 using mojo::ApplicationImpl;
33 using mojo::Gpu; 34 using mojo::Gpu;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 host_client.Pass(), connection_manager_.get(), app_impl_, 137 host_client.Pass(), connection_manager_.get(), app_impl_,
137 gpu_state_, surfaces_state_); 138 gpu_state_, surfaces_state_);
138 139
139 // ViewTreeHostConnection manages its own lifetime. 140 // ViewTreeHostConnection manages its own lifetime.
140 host_impl->Init(new ViewTreeHostConnectionImpl( 141 host_impl->Init(new ViewTreeHostConnectionImpl(
141 host.Pass(), make_scoped_ptr(host_impl), tree_client.Pass(), 142 host.Pass(), make_scoped_ptr(host_impl), tree_client.Pass(),
142 connection_manager_.get())); 143 connection_manager_.get()));
143 } 144 }
144 145
145 } // namespace mus 146 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/gles2/command_buffer_driver.cc ('k') | components/mus/vm/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698