OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/wm/shelf_layout_manager.h" | 7 #include "ash/wm/shelf_layout_manager.h" |
8 #include "base/auto_reset.h" | 8 #include "base/auto_reset.h" |
9 | 9 |
10 namespace aura_shell { | 10 namespace ash { |
11 namespace internal { | 11 namespace internal { |
12 | 12 |
13 //////////////////////////////////////////////////////////////////////////////// | 13 //////////////////////////////////////////////////////////////////////////////// |
14 // StatusAreaLayoutManager, public: | 14 // StatusAreaLayoutManager, public: |
15 | 15 |
16 StatusAreaLayoutManager::StatusAreaLayoutManager(ShelfLayoutManager* shelf) | 16 StatusAreaLayoutManager::StatusAreaLayoutManager(ShelfLayoutManager* shelf) |
17 : in_layout_(false), | 17 : in_layout_(false), |
18 shelf_(shelf) { | 18 shelf_(shelf) { |
19 } | 19 } |
20 | 20 |
(...skipping 30 matching lines...) Expand all Loading... |
51 | 51 |
52 void StatusAreaLayoutManager::LayoutStatusArea() { | 52 void StatusAreaLayoutManager::LayoutStatusArea() { |
53 // Shelf layout manager may be already doing layout. | 53 // Shelf layout manager may be already doing layout. |
54 if (shelf_->in_layout()) | 54 if (shelf_->in_layout()) |
55 return; | 55 return; |
56 | 56 |
57 AutoReset<bool> auto_reset_in_layout(&in_layout_, true); | 57 AutoReset<bool> auto_reset_in_layout(&in_layout_, true); |
58 shelf_->LayoutShelf(); | 58 shelf_->LayoutShelf(); |
59 } | 59 } |
60 | 60 |
61 } // internal | 61 } // namespace internal |
62 } // aura_shell | 62 } // namespace ash |
OLD | NEW |