Index: ash/common/shelf/shelf_widget.cc |
diff --git a/ash/common/shelf/shelf_widget.cc b/ash/common/shelf/shelf_widget.cc |
index 187e3d20f67f23683df32e9b91192e33f6f4f81e..3c4b94750d8462049d876c6cc028bcb26639ece9 100644 |
--- a/ash/common/shelf/shelf_widget.cc |
+++ b/ash/common/shelf/shelf_widget.cc |
@@ -7,6 +7,7 @@ |
#include "ash/common/focus_cycler.h" |
#include "ash/common/material_design/material_design_controller.h" |
#include "ash/common/session/session_state_delegate.h" |
+#include "ash/common/shelf/app_list_button.h" |
#include "ash/common/shelf/shelf_background_animator_observer.h" |
#include "ash/common/shelf/shelf_constants.h" |
#include "ash/common/shelf/shelf_delegate.h" |
@@ -433,6 +434,10 @@ void ShelfWidget::SetShelfVisibility(bool visible) { |
shelf_view_->SetVisible(visible); |
} |
+bool ShelfWidget::IsShowingAppList() const { |
+ return GetAppListButton() && GetAppListButton()->is_showing_app_list(); |
+} |
+ |
bool ShelfWidget::IsShowingContextMenu() const { |
return shelf_view_ && shelf_view_->IsShowingMenu(); |
} |
@@ -496,7 +501,7 @@ gfx::Rect ShelfWidget::GetScreenBoundsOfItemIconForWindow(WmWindow* window) { |
} |
AppListButton* ShelfWidget::GetAppListButton() const { |
- return shelf_view_->GetAppListButton(); |
+ return shelf_view_ ? shelf_view_->GetAppListButton() : nullptr; |
} |
app_list::ApplicationDragAndDropHost* |