Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: ash/common/wm_shell.cc

Issue 2462843002: Update ash to use new devtools base agent (Closed)
Patch Set: Rename devtools_dom_agent.* to ash_devtools_dom_agent.* Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/common/devtools/devtools_dom_agent.cc ('k') | components/ui_devtools/devtools_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/devtools/ash_devtools_dom_agent.h"
13 #include "ash/common/focus_cycler.h" 13 #include "ash/common/focus_cycler.h"
14 #include "ash/common/keyboard/keyboard_ui.h" 14 #include "ash/common/keyboard/keyboard_ui.h"
15 #include "ash/common/new_window_client_proxy.h" 15 #include "ash/common/new_window_client_proxy.h"
16 #include "ash/common/palette_delegate.h" 16 #include "ash/common/palette_delegate.h"
17 #include "ash/common/session/session_state_delegate.h" 17 #include "ash/common/session/session_state_delegate.h"
18 #include "ash/common/shelf/app_list_shelf_item_delegate.h" 18 #include "ash/common/shelf/app_list_shelf_item_delegate.h"
19 #include "ash/common/shelf/shelf_controller.h" 19 #include "ash/common/shelf/shelf_controller.h"
20 #include "ash/common/shelf/shelf_delegate.h" 20 #include "ash/common/shelf/shelf_delegate.h"
21 #include "ash/common/shelf/shelf_model.h" 21 #include "ash/common/shelf/shelf_model.h"
22 #include "ash/common/shelf/shelf_window_watcher.h" 22 #include "ash/common/shelf/shelf_window_watcher.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
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();
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->AddAgent(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() {
102 // These members access WmShell in their destructors. 102 // These members access WmShell in their destructors.
103 wallpaper_controller_.reset(); 103 wallpaper_controller_.reset();
104 accessibility_delegate_.reset(); 104 accessibility_delegate_.reset();
105 105
106 // ShelfWindowWatcher has window observers and a pointer to the shelf model. 106 // ShelfWindowWatcher has window observers and a pointer to the shelf model.
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « ash/common/devtools/devtools_dom_agent.cc ('k') | components/ui_devtools/devtools_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698