| 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" |
| 11 #include "ash/common/accessibility_delegate.h" | 11 #include "ash/common/accessibility_delegate.h" |
| 12 #include "ash/common/devtools/devtools_dom_agent.h" |
| 12 #include "ash/common/focus_cycler.h" | 13 #include "ash/common/focus_cycler.h" |
| 13 #include "ash/common/keyboard/keyboard_ui.h" | 14 #include "ash/common/keyboard/keyboard_ui.h" |
| 14 #include "ash/common/new_window_client_proxy.h" | 15 #include "ash/common/new_window_client_proxy.h" |
| 15 #include "ash/common/palette_delegate.h" | 16 #include "ash/common/palette_delegate.h" |
| 16 #include "ash/common/session/session_state_delegate.h" | 17 #include "ash/common/session/session_state_delegate.h" |
| 17 #include "ash/common/shelf/app_list_shelf_item_delegate.h" | 18 #include "ash/common/shelf/app_list_shelf_item_delegate.h" |
| 18 #include "ash/common/shelf/shelf_controller.h" | 19 #include "ash/common/shelf/shelf_controller.h" |
| 19 #include "ash/common/shelf/shelf_delegate.h" | 20 #include "ash/common/shelf/shelf_delegate.h" |
| 20 #include "ash/common/shelf/shelf_model.h" | 21 #include "ash/common/shelf/shelf_model.h" |
| 21 #include "ash/common/shelf/shelf_window_watcher.h" | 22 #include "ash/common/shelf/shelf_window_watcher.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 toast_manager_.reset(new ToastManager); | 79 toast_manager_.reset(new ToastManager); |
| 79 | 80 |
| 80 // Create the app list item in the shelf data model. | 81 // Create the app list item in the shelf data model. |
| 81 AppListShelfItemDelegate::CreateAppListItemAndDelegate(shelf_model()); | 82 AppListShelfItemDelegate::CreateAppListItemAndDelegate(shelf_model()); |
| 82 | 83 |
| 83 // 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, |
| 84 // Shelf, and WallPaper could be created by the factory. | 85 // Shelf, and WallPaper could be created by the factory. |
| 85 views::FocusManagerFactory::Install(new AshFocusManagerFactory); | 86 views::FocusManagerFactory::Install(new AshFocusManagerFactory); |
| 86 | 87 |
| 87 wallpaper_controller_.reset(new WallpaperController(blocking_pool_)); | 88 wallpaper_controller_.reset(new WallpaperController(blocking_pool_)); |
| 89 |
| 90 // Start devtools server |
| 91 devtools_server_ = ui::devtools::UiDevToolsServer::Create(); |
| 92 if (devtools_server_) { |
| 93 auto dom_backend = base::MakeUnique<devtools::AshDevToolsDOMAgent>(this); |
| 94 auto devtools_client = base::MakeUnique<ui::devtools::UiDevToolsClient>( |
| 95 "Ash", devtools_server_.get()); |
| 96 devtools_client->AddDOMBackend(std::move(dom_backend)); |
| 97 devtools_server_->AttachClient(std::move(devtools_client)); |
| 98 } |
| 88 } | 99 } |
| 89 | 100 |
| 90 void WmShell::Shutdown() { | 101 void WmShell::Shutdown() { |
| 91 // These members access WmShell in their destructors. | 102 // These members access WmShell in their destructors. |
| 92 wallpaper_controller_.reset(); | 103 wallpaper_controller_.reset(); |
| 93 accessibility_delegate_.reset(); | 104 accessibility_delegate_.reset(); |
| 94 | 105 |
| 95 // ShelfWindowWatcher has window observers and a pointer to the shelf model. | 106 // ShelfWindowWatcher has window observers and a pointer to the shelf model. |
| 96 shelf_window_watcher_.reset(); | 107 shelf_window_watcher_.reset(); |
| 97 // ShelfItemDelegate subclasses it owns have complex cleanup to run (e.g. ARC | 108 // ShelfItemDelegate subclasses it owns have complex cleanup to run (e.g. ARC |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 void WmShell::DeleteToastManager() { | 394 void WmShell::DeleteToastManager() { |
| 384 toast_manager_.reset(); | 395 toast_manager_.reset(); |
| 385 } | 396 } |
| 386 | 397 |
| 387 void WmShell::SetAcceleratorController( | 398 void WmShell::SetAcceleratorController( |
| 388 std::unique_ptr<AcceleratorController> accelerator_controller) { | 399 std::unique_ptr<AcceleratorController> accelerator_controller) { |
| 389 accelerator_controller_ = std::move(accelerator_controller); | 400 accelerator_controller_ = std::move(accelerator_controller); |
| 390 } | 401 } |
| 391 | 402 |
| 392 } // namespace ash | 403 } // namespace ash |
| OLD | NEW |