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

Side by Side Diff: mash/task_viewer/task_viewer.cc

Issue 2850743004: Replace ServiceInfo with BindSourceInfo. (Closed)
Patch Set: . Created 3 years, 7 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 | « mash/task_viewer/task_viewer.h ('k') | mash/webtest/webtest.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 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 "mash/task_viewer/task_viewer.h" 5 #include "mash/task_viewer/task_viewer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 293
294 void TaskViewer::OnStart() { 294 void TaskViewer::OnStart() {
295 tracing_.Initialize(context()->connector(), context()->identity().name()); 295 tracing_.Initialize(context()->connector(), context()->identity().name());
296 296
297 aura_init_ = base::MakeUnique<views::AuraInit>( 297 aura_init_ = base::MakeUnique<views::AuraInit>(
298 context()->connector(), context()->identity(), "views_mus_resources.pak", 298 context()->connector(), context()->identity(), "views_mus_resources.pak",
299 std::string(), nullptr, views::AuraInit::Mode::AURA_MUS); 299 std::string(), nullptr, views::AuraInit::Mode::AURA_MUS);
300 } 300 }
301 301
302 void TaskViewer::OnBindInterface( 302 void TaskViewer::OnBindInterface(
303 const service_manager::ServiceInfo& source_info, 303 const service_manager::BindSourceInfo& source_info,
304 const std::string& interface_name, 304 const std::string& interface_name,
305 mojo::ScopedMessagePipeHandle interface_pipe) { 305 mojo::ScopedMessagePipeHandle interface_pipe) {
306 registry_.BindInterface(source_info.identity, interface_name, 306 registry_.BindInterface(source_info.identity, interface_name,
307 std::move(interface_pipe)); 307 std::move(interface_pipe));
308 } 308 }
309 309
310 void TaskViewer::Launch(uint32_t what, mojom::LaunchMode how) { 310 void TaskViewer::Launch(uint32_t what, mojom::LaunchMode how) {
311 bool reuse = how == mojom::LaunchMode::REUSE || 311 bool reuse = how == mojom::LaunchMode::REUSE ||
312 how == mojom::LaunchMode::DEFAULT; 312 how == mojom::LaunchMode::DEFAULT;
313 if (reuse && !windows_.empty()) { 313 if (reuse && !windows_.empty()) {
(...skipping 20 matching lines...) Expand all
334 windows_.push_back(window); 334 windows_.push_back(window);
335 } 335 }
336 336
337 void TaskViewer::Create(const service_manager::Identity& remote_identity, 337 void TaskViewer::Create(const service_manager::Identity& remote_identity,
338 ::mash::mojom::LaunchableRequest request) { 338 ::mash::mojom::LaunchableRequest request) {
339 bindings_.AddBinding(this, std::move(request)); 339 bindings_.AddBinding(this, std::move(request));
340 } 340 }
341 341
342 } // namespace task_viewer 342 } // namespace task_viewer
343 } // namespace main 343 } // namespace main
OLDNEW
« no previous file with comments | « mash/task_viewer/task_viewer.h ('k') | mash/webtest/webtest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698