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

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, 2 months 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 9de3e0918b66331d66c866ee55f098d6613fafdd..af4733ba32163fe0b208f942e53263dbd7cf67ab 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"
@@ -89,6 +90,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"
oshima 2012/10/10 19:55:52 do you need this?
Zachary Kuznia 2012/10/11 08:57:24 Done.
#if !defined(OS_MACOSX)
#include "ash/accelerators/accelerator_controller.h"
@@ -252,6 +254,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();
@@ -446,6 +449,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(
@@ -507,6 +513,8 @@ void Shell::Init() {
power_button_controller_.reset(new PowerButtonController);
AddShellObserver(power_button_controller_.get());
+ //display_controller_->InitSecondaryDisplays();
oshima 2012/10/10 19:55:52 remove this.
Zachary Kuznia 2012/10/11 08:57:24 Done.
+
if (initially_hide_cursor_)
cursor_manager_.ShowCursor(false);

Powered by Google App Engine
This is Rietveld 408576698