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

Unified Diff: ash/common/keyboard/keyboard_ui.cc

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 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 | « ash/common/devtools/ash_devtools_unittest.cc ('k') | ash/common/mojo_interface_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/keyboard/keyboard_ui.cc
diff --git a/ash/common/keyboard/keyboard_ui.cc b/ash/common/keyboard/keyboard_ui.cc
index 37fcc445cb6cd068561163490dac72a073937dc8..b5f8a5596f177c5d674ed46cedce26fd11213555 100644
--- a/ash/common/keyboard/keyboard_ui.cc
+++ b/ash/common/keyboard/keyboard_ui.cc
@@ -10,6 +10,7 @@
#include "ash/common/system/tray/system_tray_notifier.h"
#include "ash/common/system/tray_accessibility.h"
#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
#include "base/memory/ptr_util.h"
#include "ui/keyboard/keyboard_controller.h"
@@ -39,7 +40,9 @@ class KeyboardUIImpl : public KeyboardUI, public AccessibilityObserver {
// to the appropriate keyboard functions.
}
bool IsEnabled() override {
- return WmShell::Get()->accessibility_delegate()->IsVirtualKeyboardEnabled();
+ return Shell::GetInstance()
+ ->accessibility_delegate()
+ ->IsVirtualKeyboardEnabled();
}
// AccessibilityObserver:
« no previous file with comments | « ash/common/devtools/ash_devtools_unittest.cc ('k') | ash/common/mojo_interface_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698