| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 // Create the app list item in the shelf data model. | 81 // Create the app list item in the shelf data model. |
| 82 AppListShelfItemDelegate::CreateAppListItemAndDelegate(shelf_model()); | 82 AppListShelfItemDelegate::CreateAppListItemAndDelegate(shelf_model()); |
| 83 | 83 |
| 84 // Install the custom factory early on so that views::FocusManagers for Tray, | 84 // Install the custom factory early on so that views::FocusManagers for Tray, |
| 85 // Shelf, and WallPaper could be created by the factory. | 85 // Shelf, and WallPaper could be created by the factory. |
| 86 views::FocusManagerFactory::Install(new AshFocusManagerFactory); | 86 views::FocusManagerFactory::Install(new AshFocusManagerFactory); |
| 87 | 87 |
| 88 wallpaper_controller_.reset(new WallpaperController(blocking_pool_)); | 88 wallpaper_controller_.reset(new WallpaperController(blocking_pool_)); |
| 89 | 89 |
| 90 // Start devtools server | 90 // Start devtools server |
| 91 devtools_server_ = ui::devtools::UiDevToolsServer::Create(); | 91 devtools_server_ = ui::devtools::UiDevToolsServer::Create(nullptr); |
| 92 if (devtools_server_) { | 92 if (devtools_server_) { |
| 93 auto dom_backend = base::MakeUnique<devtools::AshDevToolsDOMAgent>(this); | 93 auto dom_backend = base::MakeUnique<devtools::AshDevToolsDOMAgent>(this); |
| 94 auto devtools_client = base::MakeUnique<ui::devtools::UiDevToolsClient>( | 94 auto devtools_client = base::MakeUnique<ui::devtools::UiDevToolsClient>( |
| 95 "Ash", devtools_server_.get()); | 95 "Ash", devtools_server_.get()); |
| 96 devtools_client->AddDOMBackend(std::move(dom_backend)); | 96 devtools_client->AddDOMBackend(std::move(dom_backend)); |
| 97 devtools_server_->AttachClient(std::move(devtools_client)); | 97 devtools_server_->AttachClient(std::move(devtools_client)); |
| 98 } | 98 } |
| 99 } | 99 } |
| 100 | 100 |
| 101 void WmShell::Shutdown() { | 101 void WmShell::Shutdown() { |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 void WmShell::DeleteToastManager() { | 394 void WmShell::DeleteToastManager() { |
| 395 toast_manager_.reset(); | 395 toast_manager_.reset(); |
| 396 } | 396 } |
| 397 | 397 |
| 398 void WmShell::SetAcceleratorController( | 398 void WmShell::SetAcceleratorController( |
| 399 std::unique_ptr<AcceleratorController> accelerator_controller) { | 399 std::unique_ptr<AcceleratorController> accelerator_controller) { |
| 400 accelerator_controller_ = std::move(accelerator_controller); | 400 accelerator_controller_ = std::move(accelerator_controller); |
| 401 } | 401 } |
| 402 | 402 |
| 403 } // namespace ash | 403 } // namespace ash |
| OLD | NEW |