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

Unified Diff: ash/aura/wm_shelf_aura.cc

Issue 2234033002: mash: Remove WorkspaceLayoutManagerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments; bail for non-default containers and null shelf_layout_manager. Created 4 years, 4 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
Index: ash/aura/wm_shelf_aura.cc
diff --git a/ash/aura/wm_shelf_aura.cc b/ash/aura/wm_shelf_aura.cc
index 25e60bb97e701f4870688b49844fa1b4b872f018..4b4d5cb497ddf0efdbeab41e31ec7ae2a40cc8d8 100644
--- a/ash/aura/wm_shelf_aura.cc
+++ b/ash/aura/wm_shelf_aura.cc
@@ -144,7 +144,8 @@ bool WmShelfAura::IsVisible() const {
}
void WmShelfAura::UpdateVisibilityState() {
- shelf_layout_manager_->UpdateVisibilityState();
+ if (shelf_layout_manager_)
+ shelf_layout_manager_->UpdateVisibilityState();
}
ShelfVisibilityState WmShelfAura::GetVisibilityState() const {

Powered by Google App Engine
This is Rietveld 408576698