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/wm/status_area_layout_manager.h" | 5 #include "ash/wm/status_area_layout_manager.h" |
6 | 6 |
7 #include "ash/shelf/shelf_layout_manager.h" | 7 #include "ash/shelf/shelf_layout_manager.h" |
8 #include "ash/shelf/shelf_widget.h" | 8 #include "ash/shelf/shelf_widget.h" |
9 #include "ash/system/status_area_widget.h" | 9 #include "ash/system/status_area_widget.h" |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 | 63 |
64 SetChildBoundsDirect(child, requested_bounds); | 64 SetChildBoundsDirect(child, requested_bounds); |
65 LayoutStatusArea(); | 65 LayoutStatusArea(); |
66 } | 66 } |
67 | 67 |
68 //////////////////////////////////////////////////////////////////////////////// | 68 //////////////////////////////////////////////////////////////////////////////// |
69 // StatusAreaLayoutManager, private: | 69 // StatusAreaLayoutManager, private: |
70 | 70 |
71 void StatusAreaLayoutManager::LayoutStatusArea() { | 71 void StatusAreaLayoutManager::LayoutStatusArea() { |
72 // Shelf layout manager may be already doing layout. | 72 // Shelf layout manager may be already doing layout. |
73 if (shelf_->shelf_layout_manager()->in_layout()) | 73 if (shelf_->shelf_layout_manager()->updating_bounds()) |
74 return; | 74 return; |
75 | 75 |
76 base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true); | 76 base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true); |
77 shelf_->shelf_layout_manager()->LayoutShelf(); | 77 shelf_->shelf_layout_manager()->LayoutShelf(); |
78 } | 78 } |
79 | 79 |
80 } // namespace internal | 80 } // namespace internal |
81 } // namespace ash | 81 } // namespace ash |
OLD | NEW |