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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/accessibility/accessibility_manager.cc

Issue 542623002: Minimal support for OOBE/login for chrome-athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one more nit Created 6 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 | « athena/common/container_priorities.h ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | chrome/browser/chromeos/login/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/accessibility/accessibility_manager.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index c2284c854fbd8441dc9b72dd7cbce26e236b1c08..5cfff73105b9d59c96dcddb54117ec51e5fe9b39 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -861,9 +861,11 @@ void AccessibilityManager::InputMethodChanged(
bool show_message) {
#if defined(USE_ASH)
// Sticky keys is implemented only in ash.
- ash::Shell::GetInstance()->sticky_keys_controller()->SetModifiersEnabled(
- manager->IsISOLevel5ShiftUsedByCurrentInputMethod(),
- manager->IsAltGrUsedByCurrentInputMethod());
+ if (ash::Shell::HasInstance()) {
+ ash::Shell::GetInstance()->sticky_keys_controller()->SetModifiersEnabled(
+ manager->IsISOLevel5ShiftUsedByCurrentInputMethod(),
+ manager->IsAltGrUsedByCurrentInputMethod());
+ }
#endif
const chromeos::input_method::InputMethodDescriptor descriptor =
manager->GetActiveIMEState()->GetCurrentInputMethod();
« no previous file with comments | « athena/common/container_priorities.h ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | chrome/browser/chromeos/login/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698