| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/system/status_area_layout_manager.h" | 5 #include "ash/system/status_area_layout_manager.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/shelf_layout_manager.h" | 7 #include "ash/shelf/shelf_layout_manager.h" |
| 8 #include "ash/common/shelf/shelf_widget.h" | 8 #include "ash/shelf/shelf_widget.h" |
| 9 #include "ash/common/wm_window.h" | |
| 10 #include "ash/system/status_area_widget.h" | 9 #include "ash/system/status_area_widget.h" |
| 10 #include "ash/wm_window.h" |
| 11 #include "base/auto_reset.h" | 11 #include "base/auto_reset.h" |
| 12 | 12 |
| 13 namespace ash { | 13 namespace ash { |
| 14 | 14 |
| 15 //////////////////////////////////////////////////////////////////////////////// | 15 //////////////////////////////////////////////////////////////////////////////// |
| 16 // StatusAreaLayoutManager, public: | 16 // StatusAreaLayoutManager, public: |
| 17 | 17 |
| 18 StatusAreaLayoutManager::StatusAreaLayoutManager(ShelfWidget* shelf_widget) | 18 StatusAreaLayoutManager::StatusAreaLayoutManager(ShelfWidget* shelf_widget) |
| 19 : in_layout_(false), shelf_widget_(shelf_widget) {} | 19 : in_layout_(false), shelf_widget_(shelf_widget) {} |
| 20 | 20 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 void StatusAreaLayoutManager::LayoutStatusArea() { | 54 void StatusAreaLayoutManager::LayoutStatusArea() { |
| 55 // Shelf layout manager may be already doing layout. | 55 // Shelf layout manager may be already doing layout. |
| 56 if (shelf_widget_->shelf_layout_manager()->updating_bounds()) | 56 if (shelf_widget_->shelf_layout_manager()->updating_bounds()) |
| 57 return; | 57 return; |
| 58 | 58 |
| 59 base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true); | 59 base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true); |
| 60 shelf_widget_->shelf_layout_manager()->LayoutShelf(); | 60 shelf_widget_->shelf_layout_manager()->LayoutShelf(); |
| 61 } | 61 } |
| 62 | 62 |
| 63 } // namespace ash | 63 } // namespace ash |
| OLD | NEW |