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

Unified Diff: ash/shell.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.h ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index b3cdffcffd1f1bb66938f208ed62a017ccaaf1b4..8c92ec3d2bbe7a9d751d20d0a4dbb2fce8be4a3b 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -53,6 +53,7 @@
#include "ash/high_contrast/high_contrast_controller.h"
#include "ash/host/ash_window_tree_host_init_params.h"
#include "ash/ime/input_method_event_handler.h"
+#include "ash/laser/laser_pointer_controller.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/magnifier/partial_magnification_controller.h"
#include "ash/root_window_controller.h"
@@ -539,7 +540,6 @@ Shell::~Shell() {
// delete them before invalidating the instance.
// Alphabetical. TODO(oshima): sort.
magnification_controller_.reset();
- partial_magnification_controller_.reset();
tooltip_controller_.reset();
event_client_.reset();
toplevel_window_event_handler_.reset();
@@ -561,6 +561,8 @@ Shell::~Shell() {
touch_transformer_controller_.reset();
stylus_metrics_recorder_.reset();
audio_a11y_controller_.reset();
+ laser_pointer_controller_.reset();
+ partial_magnification_controller_.reset();
#endif // defined(OS_CHROMEOS)
// This also deletes all RootWindows. Note that we invoke Shutdown() on
@@ -783,11 +785,14 @@ void Shell::Init(const ShellInitParams& init_params) {
// RootWindowController as possible.
visibility_controller_.reset(new AshVisibilityController);
+#if defined(OS_CHROMEOS)
+ laser_pointer_controller_.reset(new LaserPointerController());
+ partial_magnification_controller_.reset(new PartialMagnificationController());
+#endif
+
magnification_controller_.reset(MagnificationController::CreateInstance());
wm_shell_->CreateMruWindowTracker();
- partial_magnification_controller_.reset(new PartialMagnificationController());
-
autoclick_controller_.reset(AutoclickController::CreateInstance());
high_contrast_controller_.reset(new HighContrastController);
« no previous file with comments | « ash/shell.h ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698