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

Unified Diff: chrome/browser/ui/ash/ash_init.cc

Issue 155493002: Add key based scrolling on magnified screen for kiosk mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 f6a482ffec7d7a8f17370116093a0af2172cf2c6..d2320d0b94383695377b92aead472ee88ccabf27 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -25,6 +25,7 @@
#if defined(OS_CHROMEOS)
#include "base/sys_info.h"
+#include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/ui/ash/ime_controller_chromeos.h"
#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
#include "chromeos/chromeos_switches.h"
@@ -65,7 +66,7 @@ void OpenAsh() {
#if defined(OS_CHROMEOS)
shell->accelerator_controller()->SetImeControlDelegate(
scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass());
- ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled(
+ shell->high_contrast_controller()->SetEnabled(
chromeos::AccessibilityManager::Get()->IsHighContrastEnabled());
DCHECK(chromeos::MagnificationManager::Get());
@@ -73,9 +74,12 @@ void OpenAsh() {
chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
ash::MagnifierType magnifier_type =
chromeos::MagnificationManager::Get()->GetMagnifierType();
- ash::Shell::GetInstance()->magnification_controller()->
+ shell->magnification_controller()->
SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_FULL);
- ash::Shell::GetInstance()->partial_magnification_controller()->
+ // Enable magnifier accelerators for modes that may not have mouse cursor.
+ shell->magnification_controller()->
+ SetMagnifierAcceleratorsEnabled(chrome::IsRunningInForcedAppMode());
+ shell->partial_magnification_controller()->
SetEnabled(magnifier_enabled && magnifier_type == ash::MAGNIFIER_PARTIAL);
if (!CommandLine::ForCurrentProcess()->HasSwitch(

Powered by Google App Engine
This is Rietveld 408576698