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

Unified Diff: ash/shelf/shelf_layout_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: ash/shelf/shelf_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index 8b5d166a1ef5d03843d9b5612ba9635a008af453..994387ef5efb904adeae0b08e4b862eac803a580 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -24,7 +24,6 @@
#include "base/logging.h"
#include "base/observer_list.h"
#include "base/timer/timer.h"
-#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_controller_observer.h"
@@ -34,6 +33,10 @@ namespace aura {
class RootWindow;
}
+namespace gfx {
+class Insets;
+}
+
namespace ui {
class GestureEvent;
class ImplicitAnimationObserver;
@@ -215,6 +218,9 @@ class ASH_EXPORT ShelfLayoutManager
// Is the shelf's alignment horizontal?
bool IsHorizontalAlignment() const;
+ // Get the work area insets due to the shelf and virtual keyboard.
+ gfx::Insets GetWorkAreaInsets() const;
+
// Returns a ShelfLayoutManager on the display which has a shelf for
// given |window|. See RootWindowController::ForShelf for more info.
static ShelfLayoutManager* ForShelf(aura::Window* window);
@@ -412,6 +418,10 @@ class ASH_EXPORT ShelfLayoutManager
// keyboard.
gfx::Rect user_work_area_bounds_;
+ // The insets from the sides of the screen taken up by the shelf or virtual
+ // keyboard.
+ gfx::Insets work_area_insets_;
+
// The show hide animation duration override or 0 for default.
int duration_override_in_ms_;

Powered by Google App Engine
This is Rietveld 408576698