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

Unified Diff: ash/system/chromeos/virtual_keyboard/tray_keyboard_lock.cc

Issue 818083002: Removes tray keyboard icon from the status area. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/system/chromeos/virtual_keyboard/tray_keyboard_lock.cc
diff --git a/ash/system/chromeos/virtual_keyboard/tray_keyboard_lock.cc b/ash/system/chromeos/virtual_keyboard/tray_keyboard_lock.cc
index 53a927168394fe3e63761306070509ad21b616ea..b29daed47fdf9b4d9231b2e68ffa6bc72ff3e77b 100644
--- a/ash/system/chromeos/virtual_keyboard/tray_keyboard_lock.cc
+++ b/ash/system/chromeos/virtual_keyboard/tray_keyboard_lock.cc
@@ -104,42 +104,22 @@ void KeyboardLockDefaultView::OnAccessibilityModeChanged(
} // namespace tray
TrayKeyboardLock::TrayKeyboardLock(SystemTray* system_tray)
- : TrayImageItem(system_tray,
- IDR_AURA_UBER_TRAY_VIRTUAL_KEYBOARD_SUPPRESSED),
- virtual_keyboard_suppressed_(false) {
+ : SystemTrayItem(system_tray), virtual_keyboard_suppressed_(false) {
Shell::GetInstance()->system_tray_notifier()->AddVirtualKeyboardObserver(
this);
- Shell::GetInstance()->system_tray_notifier()->AddAccessibilityObserver(this);
}
TrayKeyboardLock::~TrayKeyboardLock() {
Shell::GetInstance()->system_tray_notifier()->RemoveVirtualKeyboardObserver(
this);
- Shell::GetInstance()->system_tray_notifier()->RemoveAccessibilityObserver(
- this);
}
void TrayKeyboardLock::OnKeyboardSuppressionChanged(bool suppressed) {
virtual_keyboard_suppressed_ = suppressed;
sadrul 2014/12/22 21:21:27 Side question: instead of also adding KeyboardLock
rsadam 2014/12/22 21:26:35 From what I understand, the DefaultView is only cr
sadrul 2014/12/22 21:32:08 Yes.
- tray_view()->SetVisible(ShouldTrayBeVisible());
}
views::View* TrayKeyboardLock::CreateDefaultView(user::LoginStatus status) {
return new tray::KeyboardLockDefaultView(this, virtual_keyboard_suppressed_);
}
-void TrayKeyboardLock::OnAccessibilityModeChanged(
- ui::AccessibilityNotificationVisibility notify) {
- tray_view()->SetVisible(ShouldTrayBeVisible());
-}
-
-bool TrayKeyboardLock::GetInitialVisibility() {
- return ShouldTrayBeVisible();
-}
-
-bool TrayKeyboardLock::ShouldTrayBeVisible() {
- // Do not show if the keyboard is enabled.
- return virtual_keyboard_suppressed_ && !keyboard::IsKeyboardEnabled();
-}
-
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698