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

Unified Diff: ash/shell.cc

Issue 2311393004: Laser tool blocks events from propagating. (Closed)
Patch Set: Fixed patch set 1 errors. 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 728ae6a11a518958d8470ddb57df09556d6883f7..4411076684a250e7a9e9d952c26ae39482a4bf65 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -52,6 +52,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"
@@ -609,6 +610,7 @@ Shell::~Shell() {
// These need a valid Shell instance to clean up properly, so explicitly
// delete them before invalidating the instance.
// Alphabetical. TODO(oshima): sort.
+ laser_pointer_controller_.reset();
magnification_controller_.reset();
partial_magnification_controller_.reset();
tooltip_controller_.reset();
@@ -865,6 +867,8 @@ void Shell::Init(const ShellInitParams& init_params) {
// RootWindowController as possible.
visibility_controller_.reset(new AshVisibilityController);
+ laser_pointer_controller_.reset(new LaserPointerController());
+
magnification_controller_.reset(MagnificationController::CreateInstance());
wm_shell_->CreateMruWindowTracker();

Powered by Google App Engine
This is Rietveld 408576698