Index: ash/shell.h |
diff --git a/ash/shell.h b/ash/shell.h |
index d050826b53c4270a58e506f5b2feb30e790ac599..1c07f80794fa27bcf529251f0b6a6d43feee1ad5 100644 |
--- a/ash/shell.h |
+++ b/ash/shell.h |
@@ -85,6 +85,7 @@ class FirstRunHelper; |
class GPUSupport; |
class HighContrastController; |
class ImmersiveHandlerFactoryAsh; |
+class LaserPointerController; |
class LinkHandlerModelFactory; |
class LocaleNotificationController; |
class LockStateController; |
@@ -299,15 +300,19 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, |
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_C
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(); |
} |
@@ -471,9 +476,14 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, |
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_; |