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

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

Issue 2156203003: shell::ApplicationRunner -> shell::ServiceRunner (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/service.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "mojo/public/c/system/main.h" 5 #include "mojo/public/c/system/main.h"
6 #include "mojo/public/cpp/bindings/binding.h" 6 #include "mojo/public/cpp/bindings/binding.h"
7 #include "services/shell/public/cpp/application_runner.h"
8 #include "services/shell/public/cpp/connector.h" 7 #include "services/shell/public/cpp/connector.h"
9 #include "services/shell/public/cpp/service.h" 8 #include "services/shell/public/cpp/service.h"
9 #include "services/shell/public/cpp/service_runner.h"
10 #include "services/ui/public/cpp/window.h" 10 #include "services/ui/public/cpp/window.h"
11 #include "services/ui/public/cpp/window_manager_delegate.h" 11 #include "services/ui/public/cpp/window_manager_delegate.h"
12 #include "services/ui/public/cpp/window_tree_client.h" 12 #include "services/ui/public/cpp/window_tree_client.h"
13 #include "services/ui/public/cpp/window_tree_client_delegate.h" 13 #include "services/ui/public/cpp/window_tree_client_delegate.h"
14 #include "ui/display/display.h" 14 #include "ui/display/display.h"
15 #include "ui/display/mojo/display_type_converters.h" 15 #include "ui/display/mojo/display_type_converters.h"
16 16
17 namespace ui { 17 namespace ui {
18 namespace test { 18 namespace test {
19 19
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // See WindowTreeClient for details on ownership. 99 // See WindowTreeClient for details on ownership.
100 ui::WindowTreeClient* window_tree_client_ = nullptr; 100 ui::WindowTreeClient* window_tree_client_ = nullptr;
101 101
102 DISALLOW_COPY_AND_ASSIGN(TestWM); 102 DISALLOW_COPY_AND_ASSIGN(TestWM);
103 }; 103 };
104 104
105 } // namespace test 105 } // namespace test
106 } // namespace ui 106 } // namespace ui
107 107
108 MojoResult MojoMain(MojoHandle shell_handle) { 108 MojoResult MojoMain(MojoHandle shell_handle) {
109 shell::ApplicationRunner runner(new ui::test::TestWM); 109 shell::ServiceRunner runner(new ui::test::TestWM);
110 return runner.Run(shell_handle); 110 return runner.Run(shell_handle);
111 } 111 }
OLDNEW
« no previous file with comments | « services/ui/service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698