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

Side by Side Diff: mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.cc

Issue 391583002: ui/platform_window: Introduce PlatformWindow for windowing primitives. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | Annotate | Revision Log
« no previous file with comments | « mojo/services/native_viewport/native_viewport_x11.cc ('k') | ui/platform_window/DEPS » ('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 "mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h" 5 #include "mojo/services/public/cpp/view_manager/lib/view_manager_test_suite.h"
6 6
7 #include "mojo/services/native_viewport/native_viewport.h"
8 #include "ui/gl/gl_surface.h" 7 #include "ui/gl/gl_surface.h"
9 8
10 #if defined(USE_X11) 9 #if defined(USE_X11)
11 #include "ui/gfx/x/x11_connection.h" 10 #include "ui/gfx/x/x11_connection.h"
12 #endif 11 #endif
13 12
14 namespace mojo { 13 namespace mojo {
15 namespace view_manager { 14 namespace view_manager {
16 15
17 ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv) 16 ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv)
18 : TestSuite(argc, argv) {} 17 : TestSuite(argc, argv) {}
19 18
20 ViewManagerTestSuite::~ViewManagerTestSuite() { 19 ViewManagerTestSuite::~ViewManagerTestSuite() {
21 } 20 }
22 21
23 void ViewManagerTestSuite::Initialize() { 22 void ViewManagerTestSuite::Initialize() {
24 #if defined(USE_X11) 23 #if defined(USE_X11)
25 // Each test ends up creating a new thread for the native viewport service. 24 // Each test ends up creating a new thread for the native viewport service.
26 // In other words we'll use X on different threads, so tell it that. 25 // In other words we'll use X on different threads, so tell it that.
27 gfx::InitializeThreadedX11(); 26 gfx::InitializeThreadedX11();
28 services::test::EnableTestNativeViewport();
29 #endif 27 #endif
30 28
31 base::TestSuite::Initialize(); 29 base::TestSuite::Initialize();
32 gfx::GLSurface::InitializeOneOffForTests(); 30 gfx::GLSurface::InitializeOneOffForTests();
33 } 31 }
34 32
35 } // namespace view_manager 33 } // namespace view_manager
36 } // namespace mojo 34 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/services/native_viewport/native_viewport_x11.cc ('k') | ui/platform_window/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698