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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 #include <signal.h> 8 #include <signal.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/chromeos/login/html_page_screen.h" 31 #include "chrome/browser/chromeos/login/html_page_screen.h"
32 #include "chrome/browser/chromeos/login/language_switch_menu.h" 32 #include "chrome/browser/chromeos/login/language_switch_menu.h"
33 #include "chrome/browser/chromeos/login/login_screen.h" 33 #include "chrome/browser/chromeos/login/login_screen.h"
34 #include "chrome/browser/chromeos/login/login_utils.h" 34 #include "chrome/browser/chromeos/login/login_utils.h"
35 #include "chrome/browser/chromeos/login/network_screen.h" 35 #include "chrome/browser/chromeos/login/network_screen.h"
36 #include "chrome/browser/chromeos/login/registration_screen.h" 36 #include "chrome/browser/chromeos/login/registration_screen.h"
37 #include "chrome/browser/chromeos/login/rounded_rect_painter.h" 37 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
38 #include "chrome/browser/chromeos/login/update_screen.h" 38 #include "chrome/browser/chromeos/login/update_screen.h"
39 #include "chrome/browser/chromeos/login/user_image_screen.h" 39 #include "chrome/browser/chromeos/login/user_image_screen.h"
40 #include "chrome/browser/chromeos/login/user_manager.h" 40 #include "chrome/browser/chromeos/login/user_manager.h"
41 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
41 #include "chrome/browser/chromeos/language_preferences.h" 42 #include "chrome/browser/chromeos/language_preferences.h"
42 #include "chrome/browser/chromeos/wm_ipc.h" 43 #include "chrome/browser/chromeos/wm_ipc.h"
43 #include "chrome/browser/pref_service.h" 44 #include "chrome/browser/pref_service.h"
44 #include "chrome/browser/profile_manager.h" 45 #include "chrome/browser/profile_manager.h"
45 #include "chrome/common/chrome_switches.h" 46 #include "chrome/common/chrome_switches.h"
46 #include "chrome/common/notification_service.h" 47 #include "chrome/common/notification_service.h"
47 #include "chrome/common/pref_names.h" 48 #include "chrome/common/pref_names.h"
48 #include "cros/chromeos_wm_ipc_enums.h" 49 #include "cros/chromeos_wm_ipc_enums.h"
49 #include "unicode/timezone.h" 50 #include "unicode/timezone.h"
50 #include "views/accelerator.h" 51 #include "views/accelerator.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 false, true, true)), 92 false, true, true)),
92 accel_network_screen_(views::Accelerator(base::VKEY_N, 93 accel_network_screen_(views::Accelerator(base::VKEY_N,
93 false, true, true)), 94 false, true, true)),
94 accel_update_screen_(views::Accelerator(base::VKEY_U, 95 accel_update_screen_(views::Accelerator(base::VKEY_U,
95 false, true, true)), 96 false, true, true)),
96 accel_image_screen_(views::Accelerator(base::VKEY_I, 97 accel_image_screen_(views::Accelerator(base::VKEY_I,
97 false, true, true)), 98 false, true, true)),
98 accel_eula_screen_(views::Accelerator(base::VKEY_E, 99 accel_eula_screen_(views::Accelerator(base::VKEY_E,
99 false, true, true)), 100 false, true, true)),
100 accel_register_screen_(views::Accelerator(base::VKEY_R, 101 accel_register_screen_(views::Accelerator(base::VKEY_R,
101 false, true, true)) { 102 false, true, true)),
103 accel_enable_accessibility_(views::Accelerator(
104 WizardAccessibilityHelper::accelerator, false, true, true)) {
102 AddAccelerator(accel_account_screen_); 105 AddAccelerator(accel_account_screen_);
103 AddAccelerator(accel_login_screen_); 106 AddAccelerator(accel_login_screen_);
104 AddAccelerator(accel_network_screen_); 107 AddAccelerator(accel_network_screen_);
105 AddAccelerator(accel_update_screen_); 108 AddAccelerator(accel_update_screen_);
106 AddAccelerator(accel_image_screen_); 109 AddAccelerator(accel_image_screen_);
107 AddAccelerator(accel_eula_screen_); 110 AddAccelerator(accel_eula_screen_);
108 AddAccelerator(accel_register_screen_); 111 AddAccelerator(accel_register_screen_);
112 AddAccelerator(accel_enable_accessibility_);
109 } 113 }
110 114
111 ~ContentView() { 115 ~ContentView() {
112 NotificationService::current()->Notify( 116 NotificationService::current()->Notify(
113 NotificationType::WIZARD_CONTENT_VIEW_DESTROYED, 117 NotificationType::WIZARD_CONTENT_VIEW_DESTROYED,
114 NotificationService::AllSources(), 118 NotificationService::AllSources(),
115 NotificationService::NoDetails()); 119 NotificationService::NoDetails());
116 } 120 }
117 121
118 bool AcceleratorPressed(const views::Accelerator& accel) { 122 bool AcceleratorPressed(const views::Accelerator& accel) {
119 WizardController* controller = WizardController::default_controller(); 123 WizardController* controller = WizardController::default_controller();
120 if (!controller) 124 if (!controller)
121 return false; 125 return false;
122 126
123 if (accel == accel_account_screen_) { 127 if (accel == accel_account_screen_) {
124 controller->ShowAccountScreen(); 128 controller->ShowAccountScreen();
125 } else if (accel == accel_login_screen_) { 129 } else if (accel == accel_login_screen_) {
126 controller->ShowLoginScreen(); 130 controller->ShowLoginScreen();
127 } else if (accel == accel_network_screen_) { 131 } else if (accel == accel_network_screen_) {
128 controller->ShowNetworkScreen(); 132 controller->ShowNetworkScreen();
129 } else if (accel == accel_update_screen_) { 133 } else if (accel == accel_update_screen_) {
130 controller->ShowUpdateScreen(); 134 controller->ShowUpdateScreen();
131 } else if (accel == accel_image_screen_) { 135 } else if (accel == accel_image_screen_) {
132 controller->ShowUserImageScreen(); 136 controller->ShowUserImageScreen();
133 } else if (accel == accel_eula_screen_) { 137 } else if (accel == accel_eula_screen_) {
134 controller->ShowEulaScreen(); 138 controller->ShowEulaScreen();
135 } else if (accel == accel_register_screen_) { 139 } else if (accel == accel_register_screen_) {
136 controller->ShowRegistrationScreen(); 140 controller->ShowRegistrationScreen();
141 } else if (accel == accel_enable_accessibility_) {
142 WizardAccessibilityHelper::GetInstance()->EnableAccessibility(
143 controller->contents(), ProfileManager::GetDefaultProfile());
137 } else { 144 } else {
138 return false; 145 return false;
139 } 146 }
140 147
141 return true; 148 return true;
142 } 149 }
143 150
144 void PaintBackground(gfx::Canvas* canvas) { 151 void PaintBackground(gfx::Canvas* canvas) {
145 if (painter_.get()) { 152 if (painter_.get()) {
146 // TODO(sky): nuke this once new login manager is in place. This needs to 153 // TODO(sky): nuke this once new login manager is in place. This needs to
(...skipping 20 matching lines...) Expand all
167 const int screen_w_; 174 const int screen_w_;
168 const int screen_h_; 175 const int screen_h_;
169 176
170 views::Accelerator accel_account_screen_; 177 views::Accelerator accel_account_screen_;
171 views::Accelerator accel_login_screen_; 178 views::Accelerator accel_login_screen_;
172 views::Accelerator accel_network_screen_; 179 views::Accelerator accel_network_screen_;
173 views::Accelerator accel_update_screen_; 180 views::Accelerator accel_update_screen_;
174 views::Accelerator accel_image_screen_; 181 views::Accelerator accel_image_screen_;
175 views::Accelerator accel_eula_screen_; 182 views::Accelerator accel_eula_screen_;
176 views::Accelerator accel_register_screen_; 183 views::Accelerator accel_register_screen_;
184 views::Accelerator accel_enable_accessibility_;
177 185
178 DISALLOW_COPY_AND_ASSIGN(ContentView); 186 DISALLOW_COPY_AND_ASSIGN(ContentView);
179 }; 187 };
180 188
181 void DeleteWizardControllerAndLaunchBrowser(WizardController* controller) { 189 void DeleteWizardControllerAndLaunchBrowser(WizardController* controller) {
182 delete controller; 190 delete controller;
183 // Launch browser after controller is deleted and its windows are closed. 191 // Launch browser after controller is deleted and its windows are closed.
184 chromeos::LoginUtils::Get()->EnableBrowserLaunch(true); 192 chromeos::LoginUtils::Get()->EnableBrowserLaunch(true);
185 ChromeThread::PostTask( 193 ChromeThread::PostTask(
186 ChromeThread::UI, 194 ChromeThread::UI,
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 } 501 }
494 502
495 const chromeos::StartupCustomizationDocument* 503 const chromeos::StartupCustomizationDocument*
496 WizardController::GetCustomization() const { 504 WizardController::GetCustomization() const {
497 return customization_.get(); 505 return customization_.get();
498 } 506 }
499 507
500 // static 508 // static
501 void WizardController::RegisterPrefs(PrefService* local_state) { 509 void WizardController::RegisterPrefs(PrefService* local_state) {
502 local_state->RegisterBooleanPref(kOobeComplete, false); 510 local_state->RegisterBooleanPref(kOobeComplete, false);
511 local_state->RegisterBooleanPref(prefs::kAccessibilityEnabled, false);
503 } 512 }
504 513
505 /////////////////////////////////////////////////////////////////////////////// 514 ///////////////////////////////////////////////////////////////////////////////
506 // WizardController, ExitHandlers: 515 // WizardController, ExitHandlers:
507 void WizardController::OnLoginSignInSelected() { 516 void WizardController::OnLoginSignInSelected() {
508 // Don't show user image screen in case of automated testing. 517 // Don't show user image screen in case of automated testing.
509 if (is_test_mode_) { 518 if (is_test_mode_) {
510 MessageLoop::current()->DeleteSoon(FROM_HERE, this); 519 MessageLoop::current()->DeleteSoon(FROM_HERE, this);
511 return; 520 return;
512 } 521 }
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 // user has changed to during OOBE. 882 // user has changed to during OOBE.
874 if (!timezone_name.empty()) { 883 if (!timezone_name.empty()) {
875 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( 884 icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
876 icu::UnicodeString::fromUTF8(timezone_name)); 885 icu::UnicodeString::fromUTF8(timezone_name));
877 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone); 886 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone);
878 } 887 }
879 } 888 }
880 } 889 }
881 890
882 } // namespace browser 891 } // namespace browser
OLDNEW
« 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