Index: ash/ash_touch_exploration_manager_chromeos.h |
diff --git a/ash/ash_touch_exploration_manager_chromeos.h b/ash/ash_touch_exploration_manager_chromeos.h |
index 736d45167696a9a414661720d5358a5ec21484c5..9a66a26495e6db6624c2a2756dade6c7b43dcbf8 100644 |
--- a/ash/ash_touch_exploration_manager_chromeos.h |
+++ b/ash/ash_touch_exploration_manager_chromeos.h |
@@ -8,17 +8,24 @@ |
#include <memory> |
#include "ash/ash_export.h" |
+#include "ash/shell_observer.h" |
#include "ash/system/accessibility_observer.h" |
#include "base/macros.h" |
+#include "base/scoped_observer.h" |
#include "ui/chromeos/touch_accessibility_enabler.h" |
#include "ui/chromeos/touch_exploration_controller.h" |
#include "ui/display/display_observer.h" |
+#include "ui/keyboard/keyboard_controller_observer.h" |
#include "ui/wm/public/activation_change_observer.h" |
namespace chromeos { |
class CrasAudioHandler; |
} |
+namespace keyboard { |
+class KeyboardController; |
+} |
+ |
namespace ash { |
class RootWindowController; |
@@ -31,7 +38,9 @@ class ASH_EXPORT AshTouchExplorationManager |
public ui::TouchExplorationControllerDelegate, |
public ui::TouchAccessibilityEnablerDelegate, |
public display::DisplayObserver, |
- public aura::client::ActivationChangeObserver { |
+ public aura::client::ActivationChangeObserver, |
+ public keyboard::KeyboardControllerObserver, |
+ public ShellObserver { |
public: |
explicit AshTouchExplorationManager( |
RootWindowController* root_window_controller); |
@@ -71,6 +80,14 @@ class ASH_EXPORT AshTouchExplorationManager |
void SetTouchAccessibilityAnchorPoint(const gfx::Point& anchor_point); |
private: |
+ // keyboard::KeyboardControllerObserver overrides: |
+ void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override; |
+ void OnKeyboardClosed() override; |
+ |
+ // ShellObserver overrides: |
+ void OnVirtualKeyboardStateChanged(bool activated, |
+ aura::Window* root_window) override; |
+ |
void UpdateTouchExplorationState(); |
bool VolumeAdjustSoundEnabled(); |
@@ -79,6 +96,9 @@ class ASH_EXPORT AshTouchExplorationManager |
RootWindowController* root_window_controller_; |
chromeos::CrasAudioHandler* audio_handler_; |
const bool enable_chromevox_arc_support_; |
+ ScopedObserver<keyboard::KeyboardController, |
+ keyboard::KeyboardControllerObserver> |
+ keyboard_observer_; |
DISALLOW_COPY_AND_ASSIGN(AshTouchExplorationManager); |
}; |