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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 5839003: Fix to enable toggling accessibility using Ctrl+Alt+Z (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years 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
« no previous file with comments | « chrome/browser/chromeos/login/wizard_accessibility_helper.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 // Time in seconds that we wait for the device to reboot. 74 // Time in seconds that we wait for the device to reboot.
75 // If reboot didn't happen, ask user to reboot device manually. 75 // If reboot didn't happen, ask user to reboot device manually.
76 const int kWaitForRebootTimeSec = 3; 76 const int kWaitForRebootTimeSec = 3;
77 77
78 // RootView of the Widget WizardController creates. Contains the contents of the 78 // RootView of the Widget WizardController creates. Contains the contents of the
79 // WizardController. 79 // WizardController.
80 class ContentView : public views::View { 80 class ContentView : public views::View {
81 public: 81 public:
82 ContentView() 82 ContentView()
83 : accel_enable_accessibility_( 83 : accel_toggle_accessibility_(
84 chromeos::WizardAccessibilityHelper::GetAccelerator()) { 84 chromeos::WizardAccessibilityHelper::GetAccelerator()) {
85 #if defined(OFFICIAL_BUILD) 85 #if defined(OFFICIAL_BUILD)
86 accel_cancel_update_ = views::Accelerator(app::VKEY_ESCAPE, 86 accel_cancel_update_ = views::Accelerator(app::VKEY_ESCAPE,
87 true, true, true); 87 true, true, true);
88 #else 88 #else
89 accel_cancel_update_ = views::Accelerator(app::VKEY_ESCAPE, 89 accel_cancel_update_ = views::Accelerator(app::VKEY_ESCAPE,
90 false, false, false); 90 false, false, false);
91 accel_account_screen_ = views::Accelerator(app::VKEY_A, 91 accel_account_screen_ = views::Accelerator(app::VKEY_A,
92 false, true, true); 92 false, true, true);
93 accel_login_screen_ = views::Accelerator(app::VKEY_L, 93 accel_login_screen_ = views::Accelerator(app::VKEY_L,
94 false, true, true); 94 false, true, true);
95 accel_network_screen_ = views::Accelerator(app::VKEY_N, 95 accel_network_screen_ = views::Accelerator(app::VKEY_N,
96 false, true, true); 96 false, true, true);
97 accel_update_screen_ = views::Accelerator(app::VKEY_U, 97 accel_update_screen_ = views::Accelerator(app::VKEY_U,
98 false, true, true); 98 false, true, true);
99 accel_image_screen_ = views::Accelerator(app::VKEY_I, 99 accel_image_screen_ = views::Accelerator(app::VKEY_I,
100 false, true, true); 100 false, true, true);
101 accel_eula_screen_ = views::Accelerator(app::VKEY_E, 101 accel_eula_screen_ = views::Accelerator(app::VKEY_E,
102 false, true, true); 102 false, true, true);
103 accel_register_screen_ = views::Accelerator(app::VKEY_R, 103 accel_register_screen_ = views::Accelerator(app::VKEY_R,
104 false, true, true); 104 false, true, true);
105 AddAccelerator(accel_account_screen_); 105 AddAccelerator(accel_account_screen_);
106 AddAccelerator(accel_login_screen_); 106 AddAccelerator(accel_login_screen_);
107 AddAccelerator(accel_network_screen_); 107 AddAccelerator(accel_network_screen_);
108 AddAccelerator(accel_update_screen_); 108 AddAccelerator(accel_update_screen_);
109 AddAccelerator(accel_image_screen_); 109 AddAccelerator(accel_image_screen_);
110 AddAccelerator(accel_eula_screen_); 110 AddAccelerator(accel_eula_screen_);
111 AddAccelerator(accel_register_screen_); 111 AddAccelerator(accel_register_screen_);
112 #endif 112 #endif
113 AddAccelerator(accel_enable_accessibility_); 113 AddAccelerator(accel_toggle_accessibility_);
114 AddAccelerator(accel_cancel_update_); 114 AddAccelerator(accel_cancel_update_);
115 } 115 }
116 116
117 ~ContentView() { 117 ~ContentView() {
118 NotificationService::current()->Notify( 118 NotificationService::current()->Notify(
119 NotificationType::WIZARD_CONTENT_VIEW_DESTROYED, 119 NotificationType::WIZARD_CONTENT_VIEW_DESTROYED,
120 NotificationService::AllSources(), 120 NotificationService::AllSources(),
121 NotificationService::NoDetails()); 121 NotificationService::NoDetails());
122 } 122 }
123 123
124 bool AcceleratorPressed(const views::Accelerator& accel) { 124 bool AcceleratorPressed(const views::Accelerator& accel) {
125 WizardController* controller = WizardController::default_controller(); 125 WizardController* controller = WizardController::default_controller();
126 if (!controller) 126 if (!controller)
127 return false; 127 return false;
128 128
129 if (accel == accel_enable_accessibility_) { 129 if (accel == accel_toggle_accessibility_) {
130 chromeos::WizardAccessibilityHelper::GetInstance()->EnableAccessibility( 130 chromeos::WizardAccessibilityHelper::GetInstance()->ToggleAccessibility(
131 controller->contents()); } 131 controller->contents()); }
132 else if (accel == accel_cancel_update_) { 132 else if (accel == accel_cancel_update_) {
133 controller->CancelOOBEUpdate(); 133 controller->CancelOOBEUpdate();
134 #if !defined(OFFICIAL_BUILD) 134 #if !defined(OFFICIAL_BUILD)
135 } else if (accel == accel_account_screen_) { 135 } else if (accel == accel_account_screen_) {
136 controller->ShowAccountScreen(); 136 controller->ShowAccountScreen();
137 } else if (accel == accel_login_screen_) { 137 } else if (accel == accel_login_screen_) {
138 controller->ShowLoginScreen(); 138 controller->ShowLoginScreen();
139 } else if (accel == accel_network_screen_) { 139 } else if (accel == accel_network_screen_) {
140 controller->ShowNetworkScreen(); 140 controller->ShowNetworkScreen();
(...skipping 26 matching lines...) Expand all
167 167
168 #if !defined(OFFICIAL_BUILD) 168 #if !defined(OFFICIAL_BUILD)
169 views::Accelerator accel_account_screen_; 169 views::Accelerator accel_account_screen_;
170 views::Accelerator accel_login_screen_; 170 views::Accelerator accel_login_screen_;
171 views::Accelerator accel_network_screen_; 171 views::Accelerator accel_network_screen_;
172 views::Accelerator accel_update_screen_; 172 views::Accelerator accel_update_screen_;
173 views::Accelerator accel_image_screen_; 173 views::Accelerator accel_image_screen_;
174 views::Accelerator accel_eula_screen_; 174 views::Accelerator accel_eula_screen_;
175 views::Accelerator accel_register_screen_; 175 views::Accelerator accel_register_screen_;
176 #endif 176 #endif
177 views::Accelerator accel_enable_accessibility_; 177 views::Accelerator accel_toggle_accessibility_;
178 views::Accelerator accel_cancel_update_; 178 views::Accelerator accel_cancel_update_;
179 179
180 DISALLOW_COPY_AND_ASSIGN(ContentView); 180 DISALLOW_COPY_AND_ASSIGN(ContentView);
181 }; 181 };
182 182
183 void DeleteWizardControllerAndLaunchBrowser(WizardController* controller) { 183 void DeleteWizardControllerAndLaunchBrowser(WizardController* controller) {
184 delete controller; 184 delete controller;
185 // Launch browser after controller is deleted and its windows are closed. 185 // Launch browser after controller is deleted and its windows are closed.
186 chromeos::LoginUtils::Get()->EnableBrowserLaunch(true); 186 chromeos::LoginUtils::Get()->EnableBrowserLaunch(true);
187 BrowserThread::PostTask( 187 BrowserThread::PostTask(
(...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 // user has changed to during OOBE. 1032 // user has changed to during OOBE.
1033 if (!timezone_name.empty()) { 1033 if (!timezone_name.empty()) {
1034 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( 1034 icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
1035 icu::UnicodeString::fromUTF8(timezone_name)); 1035 icu::UnicodeString::fromUTF8(timezone_name));
1036 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone); 1036 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone);
1037 } 1037 }
1038 } 1038 }
1039 } 1039 }
1040 1040
1041 } // namespace browser 1041 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_accessibility_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698