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

Unified Diff: chrome/browser/chromeos/accessibility/accessibility_manager.h

Issue 1274563004: Show ChromeVox caption panel when spoken feedback is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chromevox_panel_html
Patch Set: Add SetDisplayWorkAreaInsetsForTesting for tests Created 5 years, 1 month 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: chrome/browser/chromeos/accessibility/accessibility_manager.h
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h
index c961b205611a6156155f7457dcdc20efd3e7426a..3958f964b7f536e23d58d9bd6639633bfb6d2ddf 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.h
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h
@@ -16,6 +16,7 @@
#include "base/scoped_observer.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
+#include "chrome/browser/chromeos/accessibility/chromevox_panel.h"
#include "chrome/browser/extensions/api/braille_display_private/braille_controller.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -68,6 +69,8 @@ typedef base::CallbackList<void(const AccessibilityStatusEventDetails&)>
typedef AccessibilityStatusCallbackList::Subscription
AccessibilityStatusSubscription;
+class ChromeVoxPanelWidgetObserver;
+
// AccessibilityManager changes the statuses of accessibility features
// watching profile notifications and pref-changes.
// TODO(yoshiki): merge MagnificationManager with AccessibilityManager.
@@ -200,6 +203,14 @@ class AccessibilityManager
// chromeos/audio/chromeos_sounds.h.
void PlayEarcon(int sound_key);
+ // Get work area insets due to accessibility overlays on one of the
+ // screen edges.
+ void ComputeWorkAreaInsets(aura::Window* root_window,
+ gfx::Insets* out_insets) const;
+
+ // Called by our widget observer when the ChromeVoxPanel is closing.
+ void OnChromeVoxPanelClosing();
+
// Profile having the a11y context.
Profile* profile() { return profile_; }
@@ -293,6 +304,9 @@ class AccessibilityManager
bool braille_ime_current_;
+ ChromeVoxPanel* chromevox_panel_;
+ ChromeVoxPanelWidgetObserver* chromevox_panel_widget_observer_;
Jun Mukai 2015/11/06 18:21:04 Consider using scoped_ptr. Also you don't have to
dmazzoni 2015/11/09 23:02:06 Switched to using scoped_ptr, but I can't use scop
+
base::WeakPtrFactory<AccessibilityManager> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(AccessibilityManager);

Powered by Google App Engine
This is Rietveld 408576698