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

Unified Diff: ash/common/shelf/wm_shelf.h

Issue 2072023003: mash: Break ash system tray dependencies on ash::ShelfWidget (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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/aura/wm_shelf_aura.cc ('k') | ash/focus_cycler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/wm_shelf.h
diff --git a/ash/common/shelf/wm_shelf.h b/ash/common/shelf/wm_shelf.h
index 834b494811eee46d5c5757084eb0ff12068a3c97..ac63988e3dfb38e4ab0bf009d27e88180282f313 100644
--- a/ash/common/shelf/wm_shelf.h
+++ b/ash/common/shelf/wm_shelf.h
@@ -12,6 +12,11 @@ namespace gfx {
class Rect;
}
+namespace ui {
+class GestureEvent;
+class MouseEvent;
+}
+
namespace ash {
class WmShelfObserver;
@@ -31,12 +36,26 @@ class ASH_EXPORT WmShelf {
virtual ShelfAutoHideState GetAutoHideState() const = 0;
+ // Invoke when the auto-hide state may have changed (for example, when the
+ // system tray bubble opens it should force the shelf to be visible).
+ virtual void UpdateAutoHideState() = 0;
+
virtual ShelfBackgroundType GetBackgroundType() const = 0;
+ // Shelf items are slightly dimmed (e.g. when a window is maximized).
+ virtual bool IsDimmed() const = 0;
+
+ // Whether the shelf view is visible.
+ // TODO(jamescook): Consolidate this with GetVisibilityState().
+ virtual bool IsVisible() const = 0;
+
virtual void UpdateVisibilityState() = 0;
virtual ShelfVisibilityState GetVisibilityState() const = 0;
+ // Returns the ideal bounds of the shelf assuming it is visible.
+ virtual gfx::Rect GetIdealBounds() = 0;
+
virtual gfx::Rect GetUserWorkAreaBounds() const = 0;
virtual void UpdateIconPositionForWindow(WmWindow* window) = 0;
@@ -45,6 +64,10 @@ class ASH_EXPORT WmShelf {
// no item for the specified window an empty rect is returned.
virtual gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) = 0;
+ // TODO(jamescook): Nuke when ash_sysui is removed. http://crbug.com/621112
+ virtual void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) = 0;
+ virtual void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) = 0;
+
virtual void AddObserver(WmShelfObserver* observer) = 0;
virtual void RemoveObserver(WmShelfObserver* observer) = 0;
« no previous file with comments | « ash/aura/wm_shelf_aura.cc ('k') | ash/focus_cycler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698