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

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

Issue 2231533004: Pointer watcher modifications to support laser pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 4 years, 4 months 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/wm_shell.h ('k') | ash/shell.cc » ('j') | ash/shell.cc » ('J')
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"
(...skipping 17 matching lines...) Expand all
28 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 28 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
29 #include "ash/common/wm/mru_window_tracker.h" 29 #include "ash/common/wm/mru_window_tracker.h"
30 #include "ash/common/wm/overview/window_selector_controller.h" 30 #include "ash/common/wm/overview/window_selector_controller.h"
31 #include "ash/common/wm/window_cycle_controller.h" 31 #include "ash/common/wm/window_cycle_controller.h"
32 #include "ash/common/wm_window.h" 32 #include "ash/common/wm_window.h"
33 #include "base/bind.h" 33 #include "base/bind.h"
34 #include "base/logging.h" 34 #include "base/logging.h"
35 #include "ui/app_list/presenter/app_list_presenter.h" 35 #include "ui/app_list/presenter/app_list_presenter.h"
36 #include "ui/display/display.h" 36 #include "ui/display/display.h"
37 #include "ui/views/focus/focus_manager_factory.h" 37 #include "ui/views/focus/focus_manager_factory.h"
38 #include "ui/wm/core/cursor_manager.h"
38 39
39 #if defined(OS_CHROMEOS) 40 #if defined(OS_CHROMEOS)
40 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h " 41 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h "
41 #include "ash/common/system/chromeos/keyboard_brightness_controller.h" 42 #include "ash/common/system/chromeos/keyboard_brightness_controller.h"
42 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h" 43 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
43 #endif 44 #endif
44 45
45 namespace ash { 46 namespace ash {
46 47
47 // static 48 // static
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 267
267 void WmShell::DeleteToastManager() { 268 void WmShell::DeleteToastManager() {
268 toast_manager_.reset(); 269 toast_manager_.reset();
269 } 270 }
270 271
271 void WmShell::SetAcceleratorController( 272 void WmShell::SetAcceleratorController(
272 std::unique_ptr<AcceleratorController> accelerator_controller) { 273 std::unique_ptr<AcceleratorController> accelerator_controller) {
273 accelerator_controller_ = std::move(accelerator_controller); 274 accelerator_controller_ = std::move(accelerator_controller);
274 } 275 }
275 276
277 void WmShell::SetCursorManager(
278 std::unique_ptr<::wm::CursorManager> cursor_manager) {
279 cursor_manager_ = std::move(cursor_manager);
280 }
276 } // namespace ash 281 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/shell.cc » ('j') | ash/shell.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698