Index: ui/aura_shell/desktop_layout_manager.cc |
diff --git a/ui/aura_shell/desktop_layout_manager.cc b/ui/aura_shell/desktop_layout_manager.cc |
index d54e186e547f66233daef9a4fd5ce74e201dff11..7c05e1ba8c6a08a3d18000e2990460dcee32c76b 100644 |
--- a/ui/aura_shell/desktop_layout_manager.cc |
+++ b/ui/aura_shell/desktop_layout_manager.cc |
@@ -5,7 +5,6 @@ |
#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 { |
@@ -16,8 +15,7 @@ namespace internal { |
DesktopLayoutManager::DesktopLayoutManager(aura::Window* owner) |
: owner_(owner), |
- background_widget_(NULL), |
- shelf_(NULL) { |
+ background_widget_(NULL) { |
} |
DesktopLayoutManager::~DesktopLayoutManager() { |
@@ -35,9 +33,6 @@ void DesktopLayoutManager::OnWindowResized() { |
(*i)->SetBounds(fullscreen_bounds); |
background_widget_->SetBounds(fullscreen_bounds); |
- |
- if (shelf_) |
- shelf_->LayoutShelf(); |
} |
void DesktopLayoutManager::OnWindowAddedToLayout(aura::Window* child) { |
@@ -55,6 +50,5 @@ void DesktopLayoutManager::SetChildBounds(aura::Window* child, |
SetChildBoundsDirect(child, requested_bounds); |
} |
- |
} // namespace internal |
} // namespace aura_shell |