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

Unified Diff: ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h

Issue 1684823004: Refactors keyboard related code so mash can use a keyboard (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to trunk Created 4 years, 10 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/shell_init_params.h ('k') | ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h
diff --git a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h
index 0905647082ca7145414f124ef21be383089de8b3..12e1c2ce71d9c64bac70863fcda58d45c98dca47 100644
--- a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h
+++ b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h
@@ -5,8 +5,8 @@
#ifndef ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
#define ASH_SYSTEM_CHROMEOS_VIRTUAL_KEYBOARD_VIRTUAL_KEYBOARD_TRAY_H_
+#include "ash/keyboard/keyboard_ui_observer.h"
#include "ash/system/tray/tray_background_view.h"
-#include "ash/system/tray_accessibility.h"
#include "ash/system/user/login_status.h"
#include "base/macros.h"
#include "ui/views/controls/button/button.h"
@@ -18,9 +18,10 @@ class ImageButton;
namespace ash {
class StatusAreaWidget;
+// TODO(sky): make this visible on non-chromeos platforms.
class VirtualKeyboardTray : public TrayBackgroundView,
public views::ButtonListener,
- public AccessibilityObserver {
+ public KeyboardUIObserver {
public:
explicit VirtualKeyboardTray(StatusAreaWidget* status_area_widget);
~VirtualKeyboardTray() override;
@@ -35,9 +36,8 @@ class VirtualKeyboardTray : public TrayBackgroundView,
// views::ButtonListener:
void ButtonPressed(views::Button* sender, const ui::Event& event) override;
- // AccessibilityObserver:
- void OnAccessibilityModeChanged(
- ui::AccessibilityNotificationVisibility notify) override;
+ // KeyboardUIObserver:
+ void OnKeyboardEnabledStateChanged(bool new_value) override;
private:
views::ImageButton* button_; // Not owned.
« no previous file with comments | « ash/shell_init_params.h ('k') | ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698