Index: ui/aura_shell/desktop_layout_manager.cc |
=================================================================== |
--- ui/aura_shell/desktop_layout_manager.cc (revision 113185) |
+++ ui/aura_shell/desktop_layout_manager.cc (working copy) |
@@ -5,6 +5,7 @@ |
#include "ui/aura_shell/desktop_layout_manager.h" |
#include "ui/aura/window.h" |
+#include "ui/aura_shell/shelf_layout_controller.h" |
#include "ui/views/widget/widget.h" |
namespace aura_shell { |
@@ -15,7 +16,8 @@ |
DesktopLayoutManager::DesktopLayoutManager(aura::Window* owner) |
: owner_(owner), |
- background_widget_(NULL) { |
+ background_widget_(NULL), |
+ shelf_(NULL) { |
} |
DesktopLayoutManager::~DesktopLayoutManager() { |
@@ -33,6 +35,9 @@ |
(*i)->SetBounds(fullscreen_bounds); |
background_widget_->SetBounds(fullscreen_bounds); |
+ |
+ if (shelf_) |
+ shelf_->LayoutShelf(); |
} |
void DesktopLayoutManager::OnWindowAddedToLayout(aura::Window* child) { |
@@ -50,5 +55,6 @@ |
SetChildBoundsDirect(child, requested_bounds); |
} |
+ |
} // namespace internal |
} // namespace aura_shell |