Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/system/chromeos/virtual_keyboard/tray_keyboard_lock.h" | 5 #include "ash/system/chromeos/virtual_keyboard/tray_keyboard_lock.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/system/tray/system_tray.h" | 8 #include "ash/system/tray/system_tray.h" |
| 9 #include "ash/system/tray/tray_item_more.h" | 9 #include "ash/system/tray/tray_item_more.h" |
| 10 #include "ash/system/tray_accessibility.h" | 10 #include "ash/system/tray_accessibility.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 97 } | 97 } |
| 98 | 98 |
| 99 void KeyboardLockDefaultView::OnAccessibilityModeChanged( | 99 void KeyboardLockDefaultView::OnAccessibilityModeChanged( |
| 100 ui::AccessibilityNotificationVisibility notify) { | 100 ui::AccessibilityNotificationVisibility notify) { |
| 101 Update(); | 101 Update(); |
| 102 } | 102 } |
| 103 | 103 |
| 104 } // namespace tray | 104 } // namespace tray |
| 105 | 105 |
| 106 TrayKeyboardLock::TrayKeyboardLock(SystemTray* system_tray) | 106 TrayKeyboardLock::TrayKeyboardLock(SystemTray* system_tray) |
| 107 : TrayImageItem(system_tray, | 107 : SystemTrayItem(system_tray), virtual_keyboard_suppressed_(false) { |
| 108 IDR_AURA_UBER_TRAY_VIRTUAL_KEYBOARD_SUPPRESSED), | |
| 109 virtual_keyboard_suppressed_(false) { | |
| 110 Shell::GetInstance()->system_tray_notifier()->AddVirtualKeyboardObserver( | 108 Shell::GetInstance()->system_tray_notifier()->AddVirtualKeyboardObserver( |
| 111 this); | 109 this); |
| 112 Shell::GetInstance()->system_tray_notifier()->AddAccessibilityObserver(this); | |
| 113 } | 110 } |
| 114 | 111 |
| 115 TrayKeyboardLock::~TrayKeyboardLock() { | 112 TrayKeyboardLock::~TrayKeyboardLock() { |
| 116 Shell::GetInstance()->system_tray_notifier()->RemoveVirtualKeyboardObserver( | 113 Shell::GetInstance()->system_tray_notifier()->RemoveVirtualKeyboardObserver( |
| 117 this); | 114 this); |
| 118 Shell::GetInstance()->system_tray_notifier()->RemoveAccessibilityObserver( | |
| 119 this); | |
| 120 } | 115 } |
| 121 | 116 |
| 122 void TrayKeyboardLock::OnKeyboardSuppressionChanged(bool suppressed) { | 117 void TrayKeyboardLock::OnKeyboardSuppressionChanged(bool suppressed) { |
| 123 virtual_keyboard_suppressed_ = suppressed; | 118 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.
| |
| 124 tray_view()->SetVisible(ShouldTrayBeVisible()); | |
| 125 } | 119 } |
| 126 | 120 |
| 127 views::View* TrayKeyboardLock::CreateDefaultView(user::LoginStatus status) { | 121 views::View* TrayKeyboardLock::CreateDefaultView(user::LoginStatus status) { |
| 128 return new tray::KeyboardLockDefaultView(this, virtual_keyboard_suppressed_); | 122 return new tray::KeyboardLockDefaultView(this, virtual_keyboard_suppressed_); |
| 129 } | 123 } |
| 130 | 124 |
| 131 void TrayKeyboardLock::OnAccessibilityModeChanged( | |
| 132 ui::AccessibilityNotificationVisibility notify) { | |
| 133 tray_view()->SetVisible(ShouldTrayBeVisible()); | |
| 134 } | |
| 135 | |
| 136 bool TrayKeyboardLock::GetInitialVisibility() { | |
| 137 return ShouldTrayBeVisible(); | |
| 138 } | |
| 139 | |
| 140 bool TrayKeyboardLock::ShouldTrayBeVisible() { | |
| 141 // Do not show if the keyboard is enabled. | |
| 142 return virtual_keyboard_suppressed_ && !keyboard::IsKeyboardEnabled(); | |
| 143 } | |
| 144 | |
| 145 } // namespace ash | 125 } // namespace ash |
| OLD | NEW |