diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 06:52:54 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 06:52:54 +0000 |
| commit | 77f7c1339fef15cf6543a07c36a89ea0f09d7b85 (patch) | |
| tree | 6ec067b98b4d7a1fea038bce89e6be48980df070 /ash/shell.cc | |
| parent | 01d0241cb075fe0b27455bfe7b33aa08bf1c4240 (diff) | |
| download | chromium_src-77f7c1339fef15cf6543a07c36a89ea0f09d7b85.zip chromium_src-77f7c1339fef15cf6543a07c36a89ea0f09d7b85.tar.gz chromium_src-77f7c1339fef15cf6543a07c36a89ea0f09d7b85.tar.bz2 | |
Add the partial screen magnifier to Chrome OS.
BUG=127075
TEST=Set settings->Advanced Settings -> Accessibility -> Screen magnifier to partial. Check that the area around the mouse cursor is magnified
Review URL: https://chromiumcodereview.appspot.com/10915140
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 078305c..c3fddea 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -22,6 +22,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" @@ -273,6 +274,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(); @@ -479,7 +481,10 @@ void Shell::Init() { AddPreTargetHandler(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); |