diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 02:18:05 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 02:18:05 +0000 |
| commit | 9613eacf26ab9f04831a88a8a90831020b548918 (patch) | |
| tree | 378d9b88b0eb6caf24ad32abe81c92e898f4661f /ash/shell.cc | |
| parent | 6097cb525fabf26d254f79f400ac5362a8b094e9 (diff) | |
| download | chromium_src-9613eacf26ab9f04831a88a8a90831020b548918.zip chromium_src-9613eacf26ab9f04831a88a8a90831020b548918.tar.gz chromium_src-9613eacf26ab9f04831a88a8a90831020b548918.tar.bz2 | |
Full-screen Magnifier: Support warping the cursor on the edge
With this CL, a magnified region will moved when the cursor on the edge.
Only on debug build, we can test the this magnifier with "Ctrl + {" and "Ctrl + }" shortcut. These shortcut keys are temporary. These will be removed just after either the shortcuts or setting UI are fixed.
BUG=126880
TEST=manual test (even with high-DPI and external display)
Review URL: https://chromiumcodereview.appspot.com/10388141
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index ecdeab0..b871421 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -418,13 +418,15 @@ void Shell::Init() { window_modality_controller_.reset(new internal::WindowModalityController); AddEnvEventFilter(window_modality_controller_.get()); + magnification_controller_.reset( + internal::MagnificationController::CreateInstance()); + if (internal::MonitorController::IsExtendedDesktopEnabled()) { mouse_cursor_filter_.reset( new internal::MouseCursorEventFilter(monitor_controller_.get())); AddEnvEventFilter(mouse_cursor_filter_.get()); } - magnification_controller_.reset(new internal::MagnificationController); high_contrast_controller_.reset(new HighContrastController); video_detector_.reset(new VideoDetector); window_cycle_controller_.reset(new WindowCycleController); |