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

Unified Diff: ash/aura/wm_shelf_aura.h

Issue 2029323002: mash: Convert AshPopupAlignmentDelegate to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments 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 | « no previous file | ash/aura/wm_shelf_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shelf_aura.h
diff --git a/ash/aura/wm_shelf_aura.h b/ash/aura/wm_shelf_aura.h
index b86e3d67fd9474a42d18d4e49c1bb559838a6115..d796f46586e30856251750833117fe080c3e8ba5 100644
--- a/ash/aura/wm_shelf_aura.h
+++ b/ash/aura/wm_shelf_aura.h
@@ -43,9 +43,11 @@ class ASH_EXPORT WmShelfAura : public WmShelf,
void SetAlignment(ShelfAlignment alignment) override;
ShelfAutoHideBehavior GetAutoHideBehavior() const override;
void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) override;
+ ShelfAutoHideState GetAutoHideState() const override;
ShelfBackgroundType GetBackgroundType() const override;
void UpdateVisibilityState() override;
ShelfVisibilityState GetVisibilityState() const override;
+ gfx::Rect GetUserWorkAreaBounds() const override;
void UpdateIconPositionForWindow(WmWindow* window) override;
gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;
void AddObserver(WmShelfObserver* observer) override;
@@ -53,6 +55,7 @@ class ASH_EXPORT WmShelfAura : public WmShelf,
// ShelfLayoutManagerObserver:
void WillDeleteShelfLayoutManager() override;
+ void OnAutoHideStateChanged(ShelfAutoHideState new_state) override;
void OnBackgroundUpdated(ShelfBackgroundType background_type,
BackgroundAnimatorChangeType change_type) override;
void WillChangeVisibilityState(ShelfVisibilityState new_state) override;
@@ -60,7 +63,7 @@ class ASH_EXPORT WmShelfAura : public WmShelf,
// ShelfIconObserver:
void OnShelfIconPositionsChanged() override;
- // May be null during login.
+ // May be null during login and during initialization of a secondary display.
Shelf* shelf_ = nullptr;
// Cached separately because it may be destroyed before |shelf_|.
« no previous file with comments | « no previous file | ash/aura/wm_shelf_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698