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

Unified Diff: ash/shell.cc

Issue 10915140: Add the partial screen magnifier to Chrome OS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Code review fixes Created 8 years, 1 month 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 feb1c994d07c08c9b62da53c5c8372bd88aa6a41..f7aa1730ebb33855a9333954976e048f9f72717c 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -21,6 +21,7 @@
#include "ash/focus_cycler.h"
#include "ash/high_contrast/high_contrast_controller.h"
#include "ash/magnifier/magnification_controller.h"
+#include "ash/magnifier/partial_magnification_controller.h"
#include "ash/root_window_controller.h"
#include "ash/screen_ash.h"
#include "ash/shell_delegate.h"
@@ -263,6 +264,7 @@ Shell::~Shell() {
// Alphabetical.
drag_drop_controller_.reset();
magnification_controller_.reset();
+ partial_magnification_controller_.reset();
power_button_controller_.reset();
session_state_controller_.reset();
resize_shadow_controller_.reset();
@@ -462,7 +464,10 @@ void Shell::Init() {
AddEnvEventFilter(window_modality_controller_.get());
magnification_controller_.reset(
- internal::MagnificationController::CreateInstance());
+ MagnificationController::CreateInstance());
+
+ partial_magnification_controller_.reset(
+ new PartialMagnificationController());
high_contrast_controller_.reset(new HighContrastController);
video_detector_.reset(new VideoDetector);

Powered by Google App Engine
This is Rietveld 408576698