OLD | NEW |
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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 windows_.back()->Activate(); | 312 windows_.back()->Activate(); |
313 return; | 313 return; |
314 } | 314 } |
315 | 315 |
316 service_manager::mojom::ServiceManagerPtr service_manager; | 316 service_manager::mojom::ServiceManagerPtr service_manager; |
317 context()->connector()->ConnectToInterface( | 317 context()->connector()->ConnectToInterface( |
318 service_manager::mojom::kServiceName, &service_manager); | 318 service_manager::mojom::kServiceName, &service_manager); |
319 | 319 |
320 service_manager::mojom::ServiceManagerListenerPtr listener; | 320 service_manager::mojom::ServiceManagerListenerPtr listener; |
321 service_manager::mojom::ServiceManagerListenerRequest request = | 321 service_manager::mojom::ServiceManagerListenerRequest request = |
322 GetProxy(&listener); | 322 MakeRequest(&listener); |
323 service_manager->AddListener(std::move(listener)); | 323 service_manager->AddListener(std::move(listener)); |
324 | 324 |
325 catalog::mojom::CatalogPtr catalog; | 325 catalog::mojom::CatalogPtr catalog; |
326 context()->connector()->ConnectToInterface(catalog::mojom::kServiceName, | 326 context()->connector()->ConnectToInterface(catalog::mojom::kServiceName, |
327 &catalog); | 327 &catalog); |
328 | 328 |
329 TaskViewerContents* task_viewer = new TaskViewerContents( | 329 TaskViewerContents* task_viewer = new TaskViewerContents( |
330 this, std::move(request), std::move(catalog)); | 330 this, std::move(request), std::move(catalog)); |
331 views::Widget* window = views::Widget::CreateWindowWithContextAndBounds( | 331 views::Widget* window = views::Widget::CreateWindowWithContextAndBounds( |
332 task_viewer, nullptr, gfx::Rect(10, 10, 500, 500)); | 332 task_viewer, nullptr, gfx::Rect(10, 10, 500, 500)); |
333 window->Show(); | 333 window->Show(); |
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 |
OLD | NEW |