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

Side by Side Diff: sky/tools/tester/tester.cc

Issue 934403002: Remove last uses of InterfaceImpl<> in Sky C++ code (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/tools/tester/test_runner.cc ('k') | sky/viewer/content_handler_impl.h » ('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 <iostream> 5 #include <iostream>
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/memory/weak_ptr.h" 7 #include "base/memory/weak_ptr.h"
8 #include "mojo/application/application_runner_chromium.h" 8 #include "mojo/application/application_runner_chromium.h"
9 #include "mojo/public/c/system/main.h" 9 #include "mojo/public/c/system/main.h"
10 #include "mojo/public/cpp/application/application_delegate.h" 10 #include "mojo/public/cpp/application/application_delegate.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 virtual void Initialize(mojo::ApplicationImpl* impl) override { 71 virtual void Initialize(mojo::ApplicationImpl* impl) override {
72 window_manager_app_->Initialize(impl); 72 window_manager_app_->Initialize(impl);
73 73
74 if (impl->args().size() >= 2) 74 if (impl->args().size() >= 2)
75 url_from_args_ = impl->args()[1]; 75 url_from_args_ = impl->args()[1];
76 } 76 }
77 virtual bool ConfigureIncomingConnection( 77 virtual bool ConfigureIncomingConnection(
78 mojo::ApplicationConnection* connection) override { 78 mojo::ApplicationConnection* connection) override {
79 window_manager_app_->ConfigureIncomingConnection(connection); 79 window_manager_app_->ConfigureIncomingConnection(connection);
80 if (test_runner_) 80 if (test_runner_)
81 connection->AddService(test_runner_->test_harness_factory()); 81 connection->AddService(test_runner_.get());
82 return true; 82 return true;
83 } 83 }
84 84
85 // Overridden from mojo::ViewManagerDelegate: 85 // Overridden from mojo::ViewManagerDelegate:
86 virtual void OnEmbed(mojo::View* root, 86 virtual void OnEmbed(mojo::View* root,
87 mojo::InterfaceRequest<mojo::ServiceProvider> services, 87 mojo::InterfaceRequest<mojo::ServiceProvider> services,
88 mojo::ServiceProviderPtr exposed_services) override { 88 mojo::ServiceProviderPtr exposed_services) override {
89 root_ = root; 89 root_ = root;
90 root_->AddObserver(this); 90 root_->AddObserver(this);
91 91
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 DISALLOW_COPY_AND_ASSIGN(SkyTester); 163 DISALLOW_COPY_AND_ASSIGN(SkyTester);
164 }; 164 };
165 165
166 } // namespace tester 166 } // namespace tester
167 } // namespace examples 167 } // namespace examples
168 168
169 MojoResult MojoMain(MojoHandle shell_handle) { 169 MojoResult MojoMain(MojoHandle shell_handle) {
170 mojo::ApplicationRunnerChromium runner(new sky::tester::SkyTester); 170 mojo::ApplicationRunnerChromium runner(new sky::tester::SkyTester);
171 return runner.Run(shell_handle); 171 return runner.Run(shell_handle);
172 } 172 }
OLDNEW
« no previous file with comments | « sky/tools/tester/test_runner.cc ('k') | sky/viewer/content_handler_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698