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

Side by Side Diff: ash/shell.h

Issue 2311393004: Laser tool blocks events from propagating. (Closed)
Patch Set: Nit. Created 4 years, 3 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/mus/bridge/wm_shell_mus.cc ('k') | ash/shell.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 class DisplayErrorObserver; 78 class DisplayErrorObserver;
79 class DisplayManager; 79 class DisplayManager;
80 class DragDropController; 80 class DragDropController;
81 class EventClientImpl; 81 class EventClientImpl;
82 class EventRewriterEventFilter; 82 class EventRewriterEventFilter;
83 class EventTransformationHandler; 83 class EventTransformationHandler;
84 class FirstRunHelper; 84 class FirstRunHelper;
85 class GPUSupport; 85 class GPUSupport;
86 class HighContrastController; 86 class HighContrastController;
87 class ImmersiveHandlerFactoryAsh; 87 class ImmersiveHandlerFactoryAsh;
88 class LaserPointerController;
88 class LinkHandlerModelFactory; 89 class LinkHandlerModelFactory;
89 class LocaleNotificationController; 90 class LocaleNotificationController;
90 class LockStateController; 91 class LockStateController;
91 enum class LoginStatus; 92 enum class LoginStatus;
92 class MagnificationController; 93 class MagnificationController;
93 class MouseCursorEventFilter; 94 class MouseCursorEventFilter;
94 class OverlayEventFilter; 95 class OverlayEventFilter;
95 class PartialMagnificationController; 96 class PartialMagnificationController;
96 class PowerButtonController; 97 class PowerButtonController;
97 class PowerEventObserver; 98 class PowerEventObserver;
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 WindowTreeHostManager* window_tree_host_manager() { 274 WindowTreeHostManager* window_tree_host_manager() {
274 return window_tree_host_manager_.get(); 275 return window_tree_host_manager_.get();
275 } 276 }
276 #if defined(OS_CHROMEOS) 277 #if defined(OS_CHROMEOS)
277 PowerEventObserver* power_event_observer() { 278 PowerEventObserver* power_event_observer() {
278 return power_event_observer_.get(); 279 return power_event_observer_.get();
279 } 280 }
280 TouchTransformerController* touch_transformer_controller() { 281 TouchTransformerController* touch_transformer_controller() {
281 return touch_transformer_controller_.get(); 282 return touch_transformer_controller_.get();
282 } 283 }
284 LaserPointerController* laser_pointer_controller() {
285 return laser_pointer_controller_.get();
286 }
287 PartialMagnificationController* partial_magnification_controller() {
288 return partial_magnification_controller_.get();
289 }
283 #endif // defined(OS_CHROMEOS) 290 #endif // defined(OS_CHROMEOS)
284 ScreenshotController* screenshot_controller() { 291 ScreenshotController* screenshot_controller() {
285 return screenshot_controller_.get(); 292 return screenshot_controller_.get();
286 } 293 }
287 MouseCursorEventFilter* mouse_cursor_filter() { 294 MouseCursorEventFilter* mouse_cursor_filter() {
288 return mouse_cursor_filter_.get(); 295 return mouse_cursor_filter_.get();
289 } 296 }
290 EventTransformationHandler* event_transformation_handler() { 297 EventTransformationHandler* event_transformation_handler() {
291 return event_transformation_handler_.get(); 298 return event_transformation_handler_.get();
292 } 299 }
293 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); } 300 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); }
294 301
295 SessionStateDelegate* session_state_delegate() { 302 SessionStateDelegate* session_state_delegate() {
296 return session_state_delegate_.get(); 303 return session_state_delegate_.get();
297 } 304 }
298 305
299 HighContrastController* high_contrast_controller() { 306 HighContrastController* high_contrast_controller() {
300 return high_contrast_controller_.get(); 307 return high_contrast_controller_.get();
301 } 308 }
302 309
303 MagnificationController* magnification_controller() { 310 MagnificationController* magnification_controller() {
304 return magnification_controller_.get(); 311 return magnification_controller_.get();
305 } 312 }
306 313
307 PartialMagnificationController* partial_magnification_controller() {
308 return partial_magnification_controller_.get();
309 }
310
311 AutoclickController* autoclick_controller() { 314 AutoclickController* autoclick_controller() {
312 return autoclick_controller_.get(); 315 return autoclick_controller_.get();
313 } 316 }
314 317
315 aura::client::ActivationClient* activation_client() { 318 aura::client::ActivationClient* activation_client() {
316 return activation_client_; 319 return activation_client_;
317 } 320 }
318 321
319 // Force the shelf to query for it's current visibility state. 322 // Force the shelf to query for it's current visibility state.
320 // TODO(jamescook): Move to Shelf. 323 // TODO(jamescook): Move to Shelf.
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 468 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
466 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 469 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
467 LinkHandlerModelFactory* link_handler_model_factory_; 470 LinkHandlerModelFactory* link_handler_model_factory_;
468 std::unique_ptr<PowerButtonController> power_button_controller_; 471 std::unique_ptr<PowerButtonController> power_button_controller_;
469 std::unique_ptr<LockStateController> lock_state_controller_; 472 std::unique_ptr<LockStateController> lock_state_controller_;
470 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_; 473 std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
471 std::unique_ptr<VideoDetector> video_detector_; 474 std::unique_ptr<VideoDetector> video_detector_;
472 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_; 475 std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
473 std::unique_ptr<HighContrastController> high_contrast_controller_; 476 std::unique_ptr<HighContrastController> high_contrast_controller_;
474 std::unique_ptr<MagnificationController> magnification_controller_; 477 std::unique_ptr<MagnificationController> magnification_controller_;
475 std::unique_ptr<PartialMagnificationController>
476 partial_magnification_controller_;
477 std::unique_ptr<AutoclickController> autoclick_controller_; 478 std::unique_ptr<AutoclickController> autoclick_controller_;
478 std::unique_ptr<aura::client::FocusClient> focus_client_; 479 std::unique_ptr<aura::client::FocusClient> focus_client_;
479 480
480 aura::client::ActivationClient* activation_client_; 481 aura::client::ActivationClient* activation_client_;
481 482
482 std::unique_ptr<ScreenshotController> screenshot_controller_; 483 std::unique_ptr<ScreenshotController> screenshot_controller_;
483 484
484 std::unique_ptr<MouseCursorEventFilter> mouse_cursor_filter_; 485 std::unique_ptr<MouseCursorEventFilter> mouse_cursor_filter_;
485 std::unique_ptr<ScreenPositionController> screen_position_controller_; 486 std::unique_ptr<ScreenPositionController> screen_position_controller_;
486 std::unique_ptr<SystemModalContainerEventFilter> modality_filter_; 487 std::unique_ptr<SystemModalContainerEventFilter> modality_filter_;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 530
530 // Implements content::ScreenOrientationController for ChromeOS 531 // Implements content::ScreenOrientationController for ChromeOS
531 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; 532 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_;
532 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_; 533 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_;
533 534
534 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; 535 std::unique_ptr<TouchTransformerController> touch_transformer_controller_;
535 536
536 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 537 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
537 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; 538 std::unique_ptr<ui::EventHandler> speech_feedback_handler_;
538 std::unique_ptr<StylusMetricsRecorder> stylus_metrics_recorder_; 539 std::unique_ptr<StylusMetricsRecorder> stylus_metrics_recorder_;
540
541 std::unique_ptr<LaserPointerController> laser_pointer_controller_;
542 std::unique_ptr<PartialMagnificationController>
543 partial_magnification_controller_;
539 #endif // defined(OS_CHROMEOS) 544 #endif // defined(OS_CHROMEOS)
540 545
541 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a 546 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
542 // pointer to vend to test code. 547 // pointer to vend to test code.
543 AshNativeCursorManager* native_cursor_manager_; 548 AshNativeCursorManager* native_cursor_manager_;
544 549
545 // Cursor may be hidden on certain key events in ChromeOS, whereas we never 550 // Cursor may be hidden on certain key events in ChromeOS, whereas we never
546 // hide the cursor on Windows. 551 // hide the cursor on Windows.
547 std::unique_ptr<::wm::CursorManager> cursor_manager_; 552 std::unique_ptr<::wm::CursorManager> cursor_manager_;
548 553
549 // For testing only: simulate that a modal window is open 554 // For testing only: simulate that a modal window is open
550 bool simulate_modal_window_open_for_testing_; 555 bool simulate_modal_window_open_for_testing_;
551 556
552 bool is_touch_hud_projection_enabled_; 557 bool is_touch_hud_projection_enabled_;
553 558
554 // Injected content::GPUDataManager support. 559 // Injected content::GPUDataManager support.
555 std::unique_ptr<GPUSupport> gpu_support_; 560 std::unique_ptr<GPUSupport> gpu_support_;
556 561
557 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; 562 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
558 563
559 DISALLOW_COPY_AND_ASSIGN(Shell); 564 DISALLOW_COPY_AND_ASSIGN(Shell);
560 }; 565 };
561 566
562 } // namespace ash 567 } // namespace ash
563 568
564 #endif // ASH_SHELL_H_ 569 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698