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

Unified Diff: chrome/browser/ui/ash/ash_init.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: chrome/browser/ui/ash/ash_init.cc
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index 5b552177f039be0a0dbb4f391475738584f9c343..ec5f3b69fe1be843b0c0697701ed72558843a2ea 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -8,6 +8,7 @@
#include "ash/ash_switches.h"
#include "ash/high_contrast/high_contrast_controller.h"
#include "ash/magnifier/magnification_controller.h"
+#include "ash/magnifier/partial_magnification_controller.h"
#include "ash/shell.h"
#include "ash/wm/event_rewriter_event_filter.h"
#include "ash/wm/property_util.h"
@@ -89,8 +90,12 @@ void OpenAsh() {
ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(
chromeos::accessibility::IsHighContrastEnabled());
+ chromeos::accessibility::ScreenMagnifierType magnifier_type =
+ chromeos::accessibility::GetScreenMagnifierType();
ash::Shell::GetInstance()->magnification_controller()->SetEnabled(
- chromeos::accessibility::IsScreenMagnifierEnabled());
+ magnifier_type == chromeos::accessibility::MagnifierFull);
+ ash::Shell::GetInstance()->partial_magnification_controller()->SetEnabled(
+ magnifier_type == chromeos::accessibility::MagnifierPartial);
if (!CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableZeroBrowsersOpenForTests)) {

Powered by Google App Engine
This is Rietveld 408576698