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

Unified Diff: ash/common/system/chromeos/ime_menu/ime_menu_tray.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/shelf/shelf_widget.cc ('k') | ash/common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
diff --git a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
index 90db05259c233731914b86548b141d3d06031fac..a2c8013510a6486c36038d883c8b47f3070ed7e6 100644
--- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
+++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
@@ -25,6 +25,7 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/root_window_controller.h"
+#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/utf_string_conversions.h"
@@ -470,7 +471,7 @@ void ImeMenuTray::ShowKeyboardWithKeyset(const std::string& keyset) {
}
AccessibilityDelegate* accessibility_delegate =
- WmShell::Get()->accessibility_delegate();
+ Shell::GetInstance()->accessibility_delegate();
// Fails to show the keyboard.
if (accessibility_delegate->IsVirtualKeyboardEnabled())
return;
@@ -503,8 +504,9 @@ bool ImeMenuTray::ShouldShowEmojiHandwritingVoiceButtons() const {
}
bool ImeMenuTray::ShouldShowKeyboardToggle() const {
- return keyboard_suppressed_ &&
- !WmShell::Get()->accessibility_delegate()->IsVirtualKeyboardEnabled();
+ return keyboard_suppressed_ && !Shell::GetInstance()
+ ->accessibility_delegate()
+ ->IsVirtualKeyboardEnabled();
}
void ImeMenuTray::SetShelfAlignment(ShelfAlignment alignment) {
@@ -626,7 +628,8 @@ void ImeMenuTray::OnKeyboardHidden() {
if (!force_show_keyboard_)
return;
- WmShell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(false);
+ Shell::GetInstance()->accessibility_delegate()->SetVirtualKeyboardEnabled(
+ false);
force_show_keyboard_ = false;
}
« no previous file with comments | « ash/common/shelf/shelf_widget.cc ('k') | ash/common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698