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

Side by Side Diff: components/web_view/test_runner/test_runner_application_delegate.cc

Issue 1423133003: Routes calls to WM through WS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no braces Created 5 years, 1 month 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/web_view/frame_apptest.cc ('k') | mandoline/ui/desktop_ui/browser_window.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/web_view/test_runner/test_runner_application_delegate.h" 5 #include "components/web_view/test_runner/test_runner_application_delegate.h"
6 6
7 #include <iostream> 7 #include <iostream>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 } 59 }
60 60
61 //////////////////////////////////////////////////////////////////////////////// 61 ////////////////////////////////////////////////////////////////////////////////
62 // mojo::ApplicationDelegate implementation: 62 // mojo::ApplicationDelegate implementation:
63 63
64 void TestRunnerApplicationDelegate::Initialize(mojo::ApplicationImpl* app) { 64 void TestRunnerApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
65 if (!test_runner::BlinkTestPlatformInitialize()) { 65 if (!test_runner::BlinkTestPlatformInitialize()) {
66 NOTREACHED() << "Test environment could not be properly set up for blink."; 66 NOTREACHED() << "Test environment could not be properly set up for blink.";
67 } 67 }
68 app_ = app; 68 app_ = app;
69 mus::CreateSingleWindowTreeHost(app_, this, &host_); 69 mus::CreateSingleWindowTreeHost(app_, this, &host_, nullptr);
70 } 70 }
71 71
72 bool TestRunnerApplicationDelegate::ConfigureIncomingConnection( 72 bool TestRunnerApplicationDelegate::ConfigureIncomingConnection(
73 mojo::ApplicationConnection* connection) { 73 mojo::ApplicationConnection* connection) {
74 connection->AddService<web_view::LayoutTestRunner>(this); 74 connection->AddService<web_view::LayoutTestRunner>(this);
75 return true; 75 return true;
76 } 76 }
77 77
78 //////////////////////////////////////////////////////////////////////////////// 78 ////////////////////////////////////////////////////////////////////////////////
79 // mus::WindowTreeDelegate implementation: 79 // mus::WindowTreeDelegate implementation:
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 //////////////////////////////////////////////////////////////////////////////// 153 ////////////////////////////////////////////////////////////////////////////////
154 // mojo::InterfaceFactory<LayoutTestRunner> implementation: 154 // mojo::InterfaceFactory<LayoutTestRunner> implementation:
155 155
156 void TestRunnerApplicationDelegate::Create( 156 void TestRunnerApplicationDelegate::Create(
157 mojo::ApplicationConnection* connection, 157 mojo::ApplicationConnection* connection,
158 mojo::InterfaceRequest<web_view::LayoutTestRunner> request) { 158 mojo::InterfaceRequest<web_view::LayoutTestRunner> request) {
159 layout_test_runner_.AddBinding(this, request.Pass()); 159 layout_test_runner_.AddBinding(this, request.Pass());
160 } 160 }
161 161
162 } // namespace web_view 162 } // namespace web_view
OLDNEW
« no previous file with comments | « components/web_view/frame_apptest.cc ('k') | mandoline/ui/desktop_ui/browser_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698