Convert TrayAccessibility to wm common types

ash/system/ime/tray_ime_chromeos.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/ime/tray_ime_chromeos.h"
 
 #include <vector>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_utils.h"
+#include "ash/common/system/tray/wm_system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/virtual_keyboard_controller.h"
 #include "base/logging.h"
@@ skipping 208 matching lines @@
 TrayIME::TrayIME(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       tray_label_(NULL),
       default_(NULL),
       detailed_(NULL),
       keyboard_suppressed_(false),
       is_visible_(true) {
   Shell::GetInstance()->system_tray_notifier()->AddIMEObserver(this);
   Shell::GetInstance()->system_tray_notifier()->AddVirtualKeyboardObserver(
       this);
-  Shell::GetInstance()->system_tray_notifier()->AddAccessibilityObserver(this);
+  WmShell::Get()->system_tray_notifier()->AddAccessibilityObserver(this);
 }
 
 TrayIME::~TrayIME() {
   Shell::GetInstance()->system_tray_notifier()->RemoveIMEObserver(this);
-  Shell::GetInstance()->system_tray_notifier()->RemoveAccessibilityObserver(
-      this);
+  WmShell::Get()->system_tray_notifier()->RemoveAccessibilityObserver(this);
   Shell::GetInstance()->system_tray_notifier()->RemoveVirtualKeyboardObserver(
       this);
 }
 
 void TrayIME::OnKeyboardSuppressionChanged(bool suppressed) {
   keyboard_suppressed_ = suppressed;
   Update();
 }
 
 void TrayIME::OnAccessibilityModeChanged(
@@ skipping 114 matching lines @@
   else
     Update();
 }
 
 bool TrayIME::ShouldDefaultViewBeVisible() {
   return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 ||
                          ShouldShowKeyboardToggle());
 }
 
 }  // namespace ash