Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ash/common/wm_shell.h" | 5 #include "ash/common/wm_shell.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/accelerators/accelerator_controller.h" | 9 #include "ash/common/accelerators/accelerator_controller.h" |
| 10 #include "ash/common/accelerators/ash_focus_manager_factory.h" | 10 #include "ash/common/accelerators/ash_focus_manager_factory.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 86 | 86 |
| 87 // Install the custom factory early on so that views::FocusManagers for Tray, | 87 // Install the custom factory early on so that views::FocusManagers for Tray, |
| 88 // Shelf, and WallPaper could be created by the factory. | 88 // Shelf, and WallPaper could be created by the factory. |
| 89 views::FocusManagerFactory::Install(new AshFocusManagerFactory); | 89 views::FocusManagerFactory::Install(new AshFocusManagerFactory); |
| 90 | 90 |
| 91 wallpaper_controller_.reset(new WallpaperController(blocking_pool_)); | 91 wallpaper_controller_.reset(new WallpaperController(blocking_pool_)); |
| 92 | 92 |
| 93 // Start devtools server | 93 // Start devtools server |
| 94 devtools_server_ = ui::devtools::UiDevToolsServer::Create(nullptr); | 94 devtools_server_ = ui::devtools::UiDevToolsServer::Create(nullptr); |
| 95 if (devtools_server_) { | 95 if (devtools_server_) { |
| 96 auto dom_backend = base::MakeUnique<devtools::AshDevToolsDOMAgent>(this); | 96 auto dom_backend = base::MakeUnique<devtools::AshDevToolsDOMAgent>( |
| 97 this, base::MessageLoop::current()->task_runner()); | |
|
sadrul
2016/12/06 20:48:59
Use base::ThreadTaskRunnerHandle::Get() instead. B
Sarmad Hashmi
2016/12/06 22:54:34
As discussed, passing main_thread_task_runner to d
| |
| 97 auto css_backend = | 98 auto css_backend = |
| 98 base::MakeUnique<devtools::AshDevToolsCSSAgent>(dom_backend.get()); | 99 base::MakeUnique<devtools::AshDevToolsCSSAgent>(dom_backend.get()); |
| 99 auto devtools_client = base::MakeUnique<ui::devtools::UiDevToolsClient>( | 100 auto devtools_client = base::MakeUnique<ui::devtools::UiDevToolsClient>( |
| 100 "Ash", devtools_server_.get()); | 101 "Ash", devtools_server_.get()); |
| 101 devtools_client->AddAgent(std::move(dom_backend)); | 102 devtools_client->AddAgent(std::move(dom_backend)); |
| 102 devtools_client->AddAgent(std::move(css_backend)); | 103 devtools_client->AddAgent(std::move(css_backend)); |
| 103 devtools_server_->AttachClient(std::move(devtools_client)); | 104 devtools_server_->AttachClient(std::move(devtools_client)); |
| 104 } | 105 } |
| 105 } | 106 } |
| 106 | 107 |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 403 void WmShell::DeleteToastManager() { | 404 void WmShell::DeleteToastManager() { |
| 404 toast_manager_.reset(); | 405 toast_manager_.reset(); |
| 405 } | 406 } |
| 406 | 407 |
| 407 void WmShell::SetAcceleratorController( | 408 void WmShell::SetAcceleratorController( |
| 408 std::unique_ptr<AcceleratorController> accelerator_controller) { | 409 std::unique_ptr<AcceleratorController> accelerator_controller) { |
| 409 accelerator_controller_ = std::move(accelerator_controller); | 410 accelerator_controller_ = std::move(accelerator_controller); |
| 410 } | 411 } |
| 411 | 412 |
| 412 } // namespace ash | 413 } // namespace ash |
| OLD | NEW |