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

Unified Diff: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

Issue 2345333002: mash: Avoid KeyboardDrivenEventRewriter::GetInstance crash. (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index 63c07a7bce4891abf7d45fcb82b0d96181b8c919..f53ba6d38a29cd223c89eebaec951eb800af9d5b 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -303,8 +303,11 @@ void CoreOobeHandler::HandleSkipUpdateEnrollAfterEula() {
void CoreOobeHandler::HandleUpdateCurrentScreen(const std::string& screen) {
if (delegate_)
delegate_->OnCurrentScreenChanged(screen);
- KeyboardDrivenEventRewriter::GetInstance()->SetArrowToTabRewritingEnabled(
+ // TODO(mash): Support EventRewriterController; see crbug.com/647781
+ if (!chrome::IsRunningInMash()) {
+ KeyboardDrivenEventRewriter::GetInstance()->SetArrowToTabRewritingEnabled(
screen == WizardController::kEulaScreenName);
+ }
}
void CoreOobeHandler::HandleEnableHighContrast(bool enabled) {
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698