Remove Shell::shelf()|status_area_widget()|launcher()

ash/system/ime/tray_ime.cc

Index: ash/system/ime/tray_ime.cc
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
index 6abcd810c6e5e8d95578f89e5594093b44620d3b..34682a21c5703557eae7c725ccecfb962080b0d6 100644
--- a/ash/system/ime/tray_ime.cc
+++ b/ash/system/ime/tray_ime.cc
@@ -6,6 +6,7 @@
 
 #include <vector>
 
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ -335,7 +336,8 @@ void TrayIME::OnIMERefresh(bool show_message) {
     // refreshed.
     if (notification_) {
       notification_->UpdateLabel();
-    } else if (!Shell::GetInstance()->shelf()->IsVisible() || !message_shown_) {
+    } else if (!Shell::GetPrimaryRootWindowController()->shelf()->IsVisible() ||
+               !message_shown_) {
       ShowNotificationView();
       message_shown_ = true;
     }