| 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 base::MessageLoop::current()->QuitWhenIdle(); | 283 base::MessageLoop::current()->QuitWhenIdle(); |
| 284 } | 284 } |
| 285 | 285 |
| 286 void TaskViewer::Initialize(shell::Connector* connector, | 286 void TaskViewer::Initialize(shell::Connector* connector, |
| 287 const shell::Identity& identity, | 287 const shell::Identity& identity, |
| 288 uint32_t id) { | 288 uint32_t id) { |
| 289 connector_ = connector; | 289 connector_ = connector; |
| 290 tracing_.Initialize(connector, identity.name()); | 290 tracing_.Initialize(connector, identity.name()); |
| 291 | 291 |
| 292 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); | 292 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); |
| 293 views::WindowManagerConnection::Create(connector, identity); | 293 views_mus_ = views::WindowManagerConnection::Create(connector, identity); |
| 294 } | 294 } |
| 295 | 295 |
| 296 bool TaskViewer::AcceptConnection(shell::Connection* connection) { | 296 bool TaskViewer::AcceptConnection(shell::Connection* connection) { |
| 297 connection->AddInterface<mojom::Launchable>(this); | 297 connection->AddInterface<mojom::Launchable>(this); |
| 298 return true; | 298 return true; |
| 299 } | 299 } |
| 300 | 300 |
| 301 void TaskViewer::Launch(uint32_t what, mojom::LaunchMode how) { | 301 void TaskViewer::Launch(uint32_t what, mojom::LaunchMode how) { |
| 302 bool reuse = how == mojom::LaunchMode::REUSE || | 302 bool reuse = how == mojom::LaunchMode::REUSE || |
| 303 how == mojom::LaunchMode::DEFAULT; | 303 how == mojom::LaunchMode::DEFAULT; |
| (...skipping 20 matching lines...) Expand all Loading... |
| 324 windows_.push_back(window); | 324 windows_.push_back(window); |
| 325 } | 325 } |
| 326 | 326 |
| 327 void TaskViewer::Create(shell::Connection* connection, | 327 void TaskViewer::Create(shell::Connection* connection, |
| 328 mojom::LaunchableRequest request) { | 328 mojom::LaunchableRequest request) { |
| 329 bindings_.AddBinding(this, std::move(request)); | 329 bindings_.AddBinding(this, std::move(request)); |
| 330 } | 330 } |
| 331 | 331 |
| 332 } // namespace task_viewer | 332 } // namespace task_viewer |
| 333 } // namespace main | 333 } // namespace main |
| OLD | NEW |