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

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

Issue 2455833002: Pass task_runner_ to server and send 404 when incorrect url (Closed)
Patch Set: 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
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"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 new_window_delegate_.reset(delegate_->CreateNewWindowDelegate()); 88 new_window_delegate_.reset(delegate_->CreateNewWindowDelegate());
89 89
90 wallpaper_controller_.reset(new WallpaperController(blocking_pool_)); 90 wallpaper_controller_.reset(new WallpaperController(blocking_pool_));
91 91
92 // Start devtools server 92 // Start devtools server
93 devtools_server_ = ui::devtools::UiDevToolsServer::Create(); 93 devtools_server_ = ui::devtools::UiDevToolsServer::Create(
94 base::ThreadTaskRunnerHandle::Get());
sadrul 2016/10/28 02:32:27 Are sure the current thread (i.e. the UI thread) i
Sarmad Hashmi 2016/10/28 17:02:46 Changed.
94 if (devtools_server_) { 95 if (devtools_server_) {
95 std::unique_ptr<ui::devtools::protocol::DOM::Backend> backend( 96 std::unique_ptr<ui::devtools::protocol::DOM::Backend> backend(
96 new devtools::AshDevToolsDOMAgent(this)); 97 new devtools::AshDevToolsDOMAgent(this));
97 std::unique_ptr<ui::devtools::UiDevToolsClient> devtools_client( 98 std::unique_ptr<ui::devtools::UiDevToolsClient> devtools_client(
98 new ui::devtools::UiDevToolsClient("Ash", devtools_server_.get())); 99 new ui::devtools::UiDevToolsClient("Ash", devtools_server_.get()));
99 devtools_client->AddDOMBackend(std::move(backend)); 100 devtools_client->AddDOMBackend(std::move(backend));
100 devtools_server_->AttachClient(std::move(devtools_client)); 101 devtools_server_->AttachClient(std::move(devtools_client));
101 } 102 }
102 } 103 }
103 104
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 void WmShell::DeleteToastManager() { 396 void WmShell::DeleteToastManager() {
396 toast_manager_.reset(); 397 toast_manager_.reset();
397 } 398 }
398 399
399 void WmShell::SetAcceleratorController( 400 void WmShell::SetAcceleratorController(
400 std::unique_ptr<AcceleratorController> accelerator_controller) { 401 std::unique_ptr<AcceleratorController> accelerator_controller) {
401 accelerator_controller_ = std::move(accelerator_controller); 402 accelerator_controller_ = std::move(accelerator_controller);
402 } 403 }
403 404
404 } // namespace ash 405 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | components/ui_devtools/devtools_server.h » ('j') | components/ui_devtools/devtools_server.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698