diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 04:20:26 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 04:20:26 +0000 |
| commit | c1c67017189e7aebca3cf12bdf76bc781dc55281 (patch) | |
| tree | 6074cf9ea7134b18d610b11a8da0fcdedb80105b /ash/shell.cc | |
| parent | 8bb746373531af59d55280eda9f890cf26a0bbf0 (diff) | |
| download | chromium_src-c1c67017189e7aebca3cf12bdf76bc781dc55281.zip chromium_src-c1c67017189e7aebca3cf12bdf76bc781dc55281.tar.gz chromium_src-c1c67017189e7aebca3cf12bdf76bc781dc55281.tar.bz2 | |
Implements the graphics layer of the screen magnifier.
This patch contains only the graphics layer. The control layer will be on another patch.
BUG=chromium-os:26713
TEST=manual
Review URL: http://codereview.chromium.org/9950082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 5d80ad2..38d1112 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -15,6 +15,7 @@ #include "ash/focus_cycler.h" #include "ash/ime/input_method_event_filter.h" #include "ash/launcher/launcher.h" +#include "ash/magnifier/magnification_controller.h" #include "ash/monitor/monitor_controller.h" #include "ash/monitor/multi_monitor_manager.h" #include "ash/screen_ash.h" @@ -566,6 +567,7 @@ Shell::~Shell() { // Alphabetical. activation_controller_.reset(); drag_drop_controller_.reset(); + magnification_controller_.reset(); resize_shadow_controller_.reset(); shadow_controller_.reset(); window_cycle_controller_.reset(); @@ -709,6 +711,7 @@ void Shell::Init() { AddRootWindowEventFilter(tooltip_controller_.get()); drag_drop_controller_.reset(new internal::DragDropController); + magnification_controller_.reset(new internal::MagnificationController); power_button_controller_.reset(new PowerButtonController); AddShellObserver(power_button_controller_.get()); video_detector_.reset(new VideoDetector); |