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

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

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
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 #ifndef ASH_COMMON_WM_SHELL_H_ 5 #ifndef ASH_COMMON_WM_SHELL_H_
6 #define ASH_COMMON_WM_SHELL_H_ 6 #define ASH_COMMON_WM_SHELL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/ash_export.h" 13 #include "ash/ash_export.h"
14 #include "ash/common/media_delegate.h" 14 #include "ash/common/media_delegate.h"
15 #include "ash/common/metrics/gesture_action_type.h" 15 #include "ash/common/metrics/gesture_action_type.h"
16 #include "ash/common/metrics/user_metrics_action.h" 16 #include "ash/common/metrics/user_metrics_action.h"
17 #include "ash/common/wm/lock_state_observer.h" 17 #include "ash/common/wm/lock_state_observer.h"
18 #include "base/observer_list.h" 18 #include "base/observer_list.h"
19 #include "ui/base/ui_base_types.h" 19 #include "ui/base/ui_base_types.h"
20 20
21 namespace display { 21 namespace display {
22 class Display; 22 class Display;
23 } 23 }
24 24
25 namespace gfx { 25 namespace gfx {
26 class Insets; 26 class Insets;
27 class Point; 27 class Point;
28 } 28 }
29 29
30 namespace wm {
31 class CursorManager;
32 }
33
30 namespace views { 34 namespace views {
31 class PointerWatcher; 35 class PointerWatcher;
32 } 36 }
33 37
34 namespace ash { 38 namespace ash {
35 39
36 class AcceleratorController; 40 class AcceleratorController;
37 class AccessibilityDelegate; 41 class AccessibilityDelegate;
38 class BrightnessControlDelegate; 42 class BrightnessControlDelegate;
39 class DisplayInfo; 43 class DisplayInfo;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 } 97 }
94 98
95 AccessibilityDelegate* accessibility_delegate() { 99 AccessibilityDelegate* accessibility_delegate() {
96 return accessibility_delegate_.get(); 100 return accessibility_delegate_.get();
97 } 101 }
98 102
99 BrightnessControlDelegate* brightness_control_delegate() { 103 BrightnessControlDelegate* brightness_control_delegate() {
100 return brightness_control_delegate_.get(); 104 return brightness_control_delegate_.get();
101 } 105 }
102 106
107 ::wm::CursorManager* cursor_manager() {
108 return cursor_manager_.get();
109 }
110
103 FocusCycler* focus_cycler() { return focus_cycler_.get(); } 111 FocusCycler* focus_cycler() { return focus_cycler_.get(); }
104 112
105 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() { 113 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() {
106 return keyboard_brightness_control_delegate_.get(); 114 return keyboard_brightness_control_delegate_.get();
107 } 115 }
108 116
109 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); } 117 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
110 118
111 MaximizeModeController* maximize_mode_controller() { 119 MaximizeModeController* maximize_mode_controller() {
112 return maximize_mode_controller_.get(); 120 return maximize_mode_controller_.get();
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 void DeleteMaximizeModeController(); 357 void DeleteMaximizeModeController();
350 358
351 void CreateMruWindowTracker(); 359 void CreateMruWindowTracker();
352 void DeleteMruWindowTracker(); 360 void DeleteMruWindowTracker();
353 361
354 void DeleteToastManager(); 362 void DeleteToastManager();
355 363
356 void SetAcceleratorController( 364 void SetAcceleratorController(
357 std::unique_ptr<AcceleratorController> accelerator_controller); 365 std::unique_ptr<AcceleratorController> accelerator_controller);
358 366
367 void SetCursorManager(
368 std::unique_ptr<::wm::CursorManager> cursor_manager);
369
359 private: 370 private:
360 friend class AcceleratorControllerTest; 371 friend class AcceleratorControllerTest;
361 friend class ScopedRootWindowForNewWindows; 372 friend class ScopedRootWindowForNewWindows;
362 friend class Shell; 373 friend class Shell;
363 374
364 static WmShell* instance_; 375 static WmShell* instance_;
365 376
366 base::ObserverList<ShellObserver> shell_observers_; 377 base::ObserverList<ShellObserver> shell_observers_;
367 std::unique_ptr<ShellDelegate> delegate_; 378 std::unique_ptr<ShellDelegate> delegate_;
368 379
369 std::unique_ptr<AcceleratorController> accelerator_controller_; 380 std::unique_ptr<AcceleratorController> accelerator_controller_;
370 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 381 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
371 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; 382 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
383 std::unique_ptr<::wm::CursorManager> cursor_manager_;
372 std::unique_ptr<FocusCycler> focus_cycler_; 384 std::unique_ptr<FocusCycler> focus_cycler_;
373 std::unique_ptr<KeyboardBrightnessControlDelegate> 385 std::unique_ptr<KeyboardBrightnessControlDelegate>
374 keyboard_brightness_control_delegate_; 386 keyboard_brightness_control_delegate_;
375 std::unique_ptr<KeyboardUI> keyboard_ui_; 387 std::unique_ptr<KeyboardUI> keyboard_ui_;
376 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; 388 std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
377 std::unique_ptr<MediaDelegate> media_delegate_; 389 std::unique_ptr<MediaDelegate> media_delegate_;
378 std::unique_ptr<MruWindowTracker> mru_window_tracker_; 390 std::unique_ptr<MruWindowTracker> mru_window_tracker_;
379 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 391 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
380 std::unique_ptr<PaletteDelegate> palette_delegate_; 392 std::unique_ptr<PaletteDelegate> palette_delegate_;
381 std::unique_ptr<ShelfDelegate> shelf_delegate_; 393 std::unique_ptr<ShelfDelegate> shelf_delegate_;
(...skipping 14 matching lines...) Expand all
396 bool simulate_modal_window_open_for_testing_ = false; 408 bool simulate_modal_window_open_for_testing_ = false;
397 409
398 #if defined(OS_CHROMEOS) 410 #if defined(OS_CHROMEOS)
399 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 411 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
400 #endif 412 #endif
401 }; 413 };
402 414
403 } // namespace ash 415 } // namespace ash
404 416
405 #endif // ASH_COMMON_WM_SHELL_H_ 417 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698