Index: ash/common/wm_root_window_controller.cc |
diff --git a/ash/common/wm_root_window_controller.cc b/ash/common/wm_root_window_controller.cc |
index debeb1ab021214f8995ad301b4afdbe9d5ccfb28..82af9b4316f653fa2db42b6bf3335168c05c8b7b 100644 |
--- a/ash/common/wm_root_window_controller.cc |
+++ b/ash/common/wm_root_window_controller.cc |
@@ -5,9 +5,11 @@ |
#include "ash/common/wm_root_window_controller.h" |
#include "ash/common/session/session_state_delegate.h" |
+#include "ash/common/shelf/shelf_widget.h" |
#include "ash/common/shelf/wm_shelf.h" |
#include "ash/common/shell_delegate.h" |
#include "ash/common/shell_window_ids.h" |
+#include "ash/common/system/status_area_widget.h" |
#include "ash/common/wallpaper/wallpaper_delegate.h" |
#include "ash/common/wallpaper/wallpaper_widget_controller.h" |
#include "ash/common/wm/always_on_top_controller.h" |
@@ -190,6 +192,15 @@ WmRootWindowController::GetSystemModalLayoutManager(WmWindow* window) { |
: nullptr; |
} |
+void WmRootWindowController::ShowShelf() { |
+ WmShelf* shelf = GetShelf(); |
+ if (!shelf->IsShelfInitialized()) |
+ return; |
+ // TODO(jamescook): Move this into WmShelf. |
+ shelf->shelf_widget()->SetShelfVisibility(true); |
+ shelf->shelf_widget()->status_area_widget()->Show(); |
+} |
+ |
WmWindow* WmRootWindowController::GetContainer(int container_id) { |
return root_->GetChildByShellWindowId(container_id); |
} |