Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index f43a1e35d5505160205a72f4878a2466f5d49e9b..0e4ad8e0e949c22d00b15d36777f06f18ab67286 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -23,6 +23,7 @@ |
#include "ash/high_contrast/high_contrast_controller.h" |
#include "ash/launcher/launcher.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_context_menu.h" |
@@ -91,6 +92,7 @@ |
#include "ui/views/focus/focus_manager_factory.h" |
#include "ui/views/widget/native_widget_aura.h" |
#include "ui/views/widget/widget.h" |
+#include "ui/views/widget/widget_delegate.h" |
#if !defined(OS_MACOSX) |
#include "ash/accelerators/accelerator_controller.h" |
@@ -247,6 +249,7 @@ Shell::~Shell() { |
// Alphabetical. |
drag_drop_controller_.reset(); |
magnification_controller_.reset(); |
+ partial_magnification_controller_.reset(); |
power_button_controller_.reset(); |
resize_shadow_controller_.reset(); |
shadow_controller_.reset(); |
@@ -434,6 +437,9 @@ void Shell::Init() { |
magnification_controller_.reset( |
internal::MagnificationController::CreateInstance()); |
+ partial_magnification_controller_.reset( |
+ internal::PartialMagnificationController::CreateInstance()); |
+ |
high_contrast_controller_.reset(new HighContrastController); |
video_detector_.reset(new VideoDetector); |
window_cycle_controller_.reset( |