Index: ash/common/system/status_area_layout_manager.cc |
diff --git a/ash/common/system/status_area_layout_manager.cc b/ash/common/system/status_area_layout_manager.cc |
deleted file mode 100644 |
index ea622b22d7a6c58bea505784135bf07afb472d0b..0000000000000000000000000000000000000000 |
--- a/ash/common/system/status_area_layout_manager.cc |
+++ /dev/null |
@@ -1,63 +0,0 @@ |
-// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
-// Use of this source code is governed by a BSD-style license that can be |
-// found in the LICENSE file. |
- |
-#include "ash/common/system/status_area_layout_manager.h" |
- |
-#include "ash/common/shelf/shelf_layout_manager.h" |
-#include "ash/common/shelf/shelf_widget.h" |
-#include "ash/common/system/status_area_widget.h" |
-#include "ash/common/wm_window.h" |
-#include "base/auto_reset.h" |
- |
-namespace ash { |
- |
-//////////////////////////////////////////////////////////////////////////////// |
-// StatusAreaLayoutManager, public: |
- |
-StatusAreaLayoutManager::StatusAreaLayoutManager(ShelfWidget* shelf_widget) |
- : in_layout_(false), shelf_widget_(shelf_widget) {} |
- |
-StatusAreaLayoutManager::~StatusAreaLayoutManager() {} |
- |
-//////////////////////////////////////////////////////////////////////////////// |
-// StatusAreaLayoutManager, aura::LayoutManager implementation: |
- |
-void StatusAreaLayoutManager::OnWindowResized() { |
- LayoutStatusArea(); |
-} |
- |
-void StatusAreaLayoutManager::SetChildBounds( |
- WmWindow* child, |
- const gfx::Rect& requested_bounds) { |
- // Only need to have the shelf do a layout if the child changing is the status |
- // area and the shelf isn't in the process of doing a layout. |
- if (child != WmWindow::Get( |
- shelf_widget_->status_area_widget()->GetNativeWindow()) || |
- in_layout_) { |
- wm::WmSnapToPixelLayoutManager::SetChildBounds(child, requested_bounds); |
- return; |
- } |
- |
- // If the bounds match, no need to do anything. Check for target bounds to |
- // ensure any active animation is retargeted. |
- if (requested_bounds == child->GetTargetBounds()) |
- return; |
- |
- wm::WmSnapToPixelLayoutManager::SetChildBounds(child, requested_bounds); |
- LayoutStatusArea(); |
-} |
- |
-//////////////////////////////////////////////////////////////////////////////// |
-// StatusAreaLayoutManager, private: |
- |
-void StatusAreaLayoutManager::LayoutStatusArea() { |
- // Shelf layout manager may be already doing layout. |
- if (shelf_widget_->shelf_layout_manager()->updating_bounds()) |
- return; |
- |
- base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true); |
- shelf_widget_->shelf_layout_manager()->LayoutShelf(); |
-} |
- |
-} // namespace ash |