Laser tool blocks events from propagating.

ash/shell.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 67 matching lines @@
 class DisplayErrorObserver;
 class DisplayManager;
 class DragDropController;
 class EventClientImpl;
 class EventRewriterEventFilter;
 class EventTransformationHandler;
 class FirstRunHelper;
 class GPUSupport;
 class HighContrastController;
 class ImmersiveHandlerFactoryAsh;
+class LaserPointerController;
 class LinkHandlerModelFactory;
 class LocaleNotificationController;
 class LockStateController;
 enum class LoginStatus;
 class MagnificationController;
 class MouseCursorEventFilter;
 class OverlayEventFilter;
 class PartialMagnificationController;
 class PowerButtonController;
 class PowerEventObserver;
@@ skipping 194 matching lines @@
   }
   ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); }
 
   SessionStateDelegate* session_state_delegate() {
     return session_state_delegate_.get();
   }
 
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
-
+#if defined(OS_CHROMEOS)
+  LaserPointerController* laser_pointer_controller() {

[James Cook, 2016/09/16 18:13:31]

nit: I would just stick these in the existing OS_CHROMEOS block above, so this
code becomes less ifdef-y.

[sammiequon, 2016/09/16 19:21:04]

Done.

+    return laser_pointer_controller_.get();
+  }
+#endif  // defined(OS_CHROMEOS)
   MagnificationController* magnification_controller() {
     return magnification_controller_.get();
   }
-
+#if defined(OS_CHROMEOS)
   PartialMagnificationController* partial_magnification_controller() {
     return partial_magnification_controller_.get();
   }
-
+#endif  // defined(OS_CHROMEOS)
   AutoclickController* autoclick_controller() {
     return autoclick_controller_.get();
   }
 
   aura::client::ActivationClient* activation_client() {
     return activation_client_;
   }
 
   // Force the shelf to query for it's current visibility state.
   // TODO(jamescook): Move to Shelf.
@@ skipping 143 matching lines @@
   std::unique_ptr<::wm::VisibilityController> visibility_controller_;
   std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
   std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
   LinkHandlerModelFactory* link_handler_model_factory_;
   std::unique_ptr<PowerButtonController> power_button_controller_;
   std::unique_ptr<LockStateController> lock_state_controller_;
   std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
   std::unique_ptr<VideoDetector> video_detector_;
   std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
   std::unique_ptr<HighContrastController> high_contrast_controller_;
+#if defined(OS_CHROMEOS)

[James Cook, 2016/09/16 18:13:31]

ditto, move to CHROMEOS section below

[sammiequon, 2016/09/16 19:21:04]

Done.

+  std::unique_ptr<LaserPointerController> laser_pointer_controller_;
+#endif  // defined(OS_CHROMEOS)
   std::unique_ptr<MagnificationController> magnification_controller_;
+#if defined(OS_CHROMEOS)
   std::unique_ptr<PartialMagnificationController>
       partial_magnification_controller_;
+#endif  // defined(OS_CHROMEOS)
   std::unique_ptr<AutoclickController> autoclick_controller_;
   std::unique_ptr<aura::client::FocusClient> focus_client_;
 
   aura::client::ActivationClient* activation_client_;
 
   std::unique_ptr<ScreenshotController> screenshot_controller_;
 
   std::unique_ptr<MouseCursorEventFilter> mouse_cursor_filter_;
   std::unique_ptr<ScreenPositionController> screen_position_controller_;
   std::unique_ptr<SystemModalContainerEventFilter> modality_filter_;
@@ skipping 68 matching lines @@
   std::unique_ptr<GPUSupport> gpu_support_;
 
   std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_