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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 3159028: Add code to initialize accessibility for UI in the ChromeOS startup wizard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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/chromeos/login/wizard_controller.cc
===================================================================
--- chrome/browser/chromeos/login/wizard_controller.cc (revision 57390)
+++ chrome/browser/chromeos/login/wizard_controller.cc (working copy)
@@ -38,6 +38,7 @@
#include "chrome/browser/chromeos/login/update_screen.h"
#include "chrome/browser/chromeos/login/user_image_screen.h"
#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
#include "chrome/browser/chromeos/language_preferences.h"
#include "chrome/browser/chromeos/wm_ipc.h"
#include "chrome/browser/pref_service.h"
@@ -98,7 +99,9 @@
accel_eula_screen_(views::Accelerator(base::VKEY_E,
false, true, true)),
accel_register_screen_(views::Accelerator(base::VKEY_R,
- false, true, true)) {
+ false, true, true)),
+ accel_enable_accessibility_(views::Accelerator(
+ WizardAccessibilityHelper::accelerator, false, true, true)) {
AddAccelerator(accel_account_screen_);
AddAccelerator(accel_login_screen_);
AddAccelerator(accel_network_screen_);
@@ -106,6 +109,7 @@
AddAccelerator(accel_image_screen_);
AddAccelerator(accel_eula_screen_);
AddAccelerator(accel_register_screen_);
+ AddAccelerator(accel_enable_accessibility_);
}
~ContentView() {
@@ -134,6 +138,9 @@
controller->ShowEulaScreen();
} else if (accel == accel_register_screen_) {
controller->ShowRegistrationScreen();
+ } else if (accel == accel_enable_accessibility_) {
+ WizardAccessibilityHelper::GetInstance()->EnableAccessibility(
+ controller->contents(), ProfileManager::GetDefaultProfile());
} else {
return false;
}
@@ -174,6 +181,7 @@
views::Accelerator accel_image_screen_;
views::Accelerator accel_eula_screen_;
views::Accelerator accel_register_screen_;
+ views::Accelerator accel_enable_accessibility_;
DISALLOW_COPY_AND_ASSIGN(ContentView);
};
@@ -500,6 +508,7 @@
// static
void WizardController::RegisterPrefs(PrefService* local_state) {
local_state->RegisterBooleanPref(kOobeComplete, false);
+ local_state->RegisterBooleanPref(prefs::kAccessibilityEnabled, false);
}
///////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « chrome/browser/chromeos/login/wizard_accessibility_helper.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698