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

Unified Diff: ash/system/ime/tray_ime_chromeos.cc

Issue 2074913005: Convert TrayAccessibility to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@webnotification
Patch Set: rebase Created 4 years, 6 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/system/ime/tray_ime_chromeos.h ('k') | ash/system/ime/tray_ime_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/ime/tray_ime_chromeos.cc
diff --git a/ash/system/ime/tray_ime_chromeos.cc b/ash/system/ime/tray_ime_chromeos.cc
index d3a119af5e56f5cf85114dedb17af4b2b8c4423a..35cf3afcbedaa0709c0767cb5ccd67bc517b2a2a 100644
--- a/ash/system/ime/tray_ime_chromeos.cc
+++ b/ash/system/ime/tray_ime_chromeos.cc
@@ -13,6 +13,7 @@
#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"
@@ -241,13 +242,12 @@ TrayIME::TrayIME(SystemTray* system_tray)
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);
}
« no previous file with comments | « ash/system/ime/tray_ime_chromeos.h ('k') | ash/system/ime/tray_ime_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698