components/mus/public/cpp/tests/window_server_shelltest_base.cc - Issue 1877753003: Move mojo\shell to services\shell

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: components/mus/public/cpp/tests/window_server_shelltest_base.cc

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan

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 | « components/mus/public/cpp/tests/window_server_shelltest_base.h ('k') | components/mus/public/cpp/tests/window_server_test_base.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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/public/cpp/tests/window_server_shelltest_base.h"	5 #include "components/mus/public/cpp/tests/window_server_shelltest_base.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "components/mus/common/args.h"	10 #include "components/mus/common/args.h"

11 #include "mojo/shell/public/cpp/shell_client.h"	11 #include "services/shell/public/cpp/shell_client.h"

12 #include "mojo/shell/public/cpp/shell_test.h"	12 #include "services/shell/public/cpp/shell_test.h"

13 #include "ui/gl/gl_switches.h"	13 #include "ui/gl/gl_switches.h"

14	14

15 namespace mus {	15 namespace mus {

16	16

17 namespace {	17 namespace {

18	18

19 const char kTestAppName[] = "mojo:mus_ws_unittests_app";	19 const char kTestAppName[] = "mojo:mus_ws_unittests_app";

20	20

21 class WindowServerShellTestClient : public mojo::test::ShellTestClient {	21 class WindowServerShellTestClient : public mojo::test::ShellTestClient {

22 public:	22 public:

(...skipping 26 matching lines...) Expand all Loading...
49 EnsureCommandLineSwitch(switches::kOverrideUseGLWithOSMesaForTests);	49 EnsureCommandLineSwitch(switches::kOverrideUseGLWithOSMesaForTests);

50 }	50 }

51	51

52 WindowServerShellTestBase::~WindowServerShellTestBase() {}	52 WindowServerShellTestBase::~WindowServerShellTestBase() {}

53	53

54 scoped_ptr<mojo::ShellClient> WindowServerShellTestBase::CreateShellClient() {	54 scoped_ptr<mojo::ShellClient> WindowServerShellTestBase::CreateShellClient() {

55 return make_scoped_ptr(new WindowServerShellTestClient(this));	55 return make_scoped_ptr(new WindowServerShellTestClient(this));

56 }	56 }

57	57

58 } // namespace mus	58 } // namespace mus

OLD	NEW