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

Unified Diff: ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

Issue 2775973002: Promotes more accessors from WmShell to Shell (Closed)
Patch Set: feedback 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
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 d4707936b107dff9086eb1b8466cfb3f10bbe3d6..a783d08d438ce49b7ea123313c4493f3f7c0f423 100644
--- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
+++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
@@ -360,7 +360,7 @@ ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
SetInkDropMode(InkDropMode::ON);
SetupLabelForTray(label_);
tray_container()->AddChildView(label_);
- SystemTrayNotifier* tray_notifier = WmShell::Get()->system_tray_notifier();
+ SystemTrayNotifier* tray_notifier = Shell::Get()->system_tray_notifier();
tray_notifier->AddIMEObserver(this);
tray_notifier->AddVirtualKeyboardObserver(this);
}
@@ -368,7 +368,7 @@ ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
ImeMenuTray::~ImeMenuTray() {
if (bubble_)
bubble_->bubble_view()->reset_delegate();
- SystemTrayNotifier* tray_notifier = WmShell::Get()->system_tray_notifier();
+ SystemTrayNotifier* tray_notifier = Shell::Get()->system_tray_notifier();
tray_notifier->RemoveIMEObserver(this);
tray_notifier->RemoveVirtualKeyboardObserver(this);
keyboard::KeyboardController* keyboard_controller =

Powered by Google App Engine
This is Rietveld 408576698