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" |
11 #include "ui/aura/window.h" | 11 #include "ui/aura/window.h" |
12 #include "ui/views/widget/widget.h" | 12 #include "ui/views/widget/widget.h" |
13 | 13 |
14 namespace ash { | 14 namespace ash { |
15 | 15 |
16 //////////////////////////////////////////////////////////////////////////////// | 16 //////////////////////////////////////////////////////////////////////////////// |
17 // StatusAreaLayoutManager, public: | 17 // StatusAreaLayoutManager, public: |
18 | 18 |
19 StatusAreaLayoutManager::StatusAreaLayoutManager(aura::Window* container, | 19 StatusAreaLayoutManager::StatusAreaLayoutManager(aura::Window* container, |
20 ShelfWidget* shelf) | 20 ShelfWidget* shelf) |
21 : SnapToPixelLayoutManager(container), in_layout_(false), shelf_(shelf) { | 21 : SnapToPixelLayoutManager(container), in_layout_(false), shelf_(shelf) {} |
22 } | |
23 | 22 |
24 StatusAreaLayoutManager::~StatusAreaLayoutManager() { | 23 StatusAreaLayoutManager::~StatusAreaLayoutManager() {} |
25 } | |
26 | 24 |
27 //////////////////////////////////////////////////////////////////////////////// | 25 //////////////////////////////////////////////////////////////////////////////// |
28 // StatusAreaLayoutManager, aura::LayoutManager implementation: | 26 // StatusAreaLayoutManager, aura::LayoutManager implementation: |
29 | 27 |
30 void StatusAreaLayoutManager::OnWindowResized() { | 28 void StatusAreaLayoutManager::OnWindowResized() { |
31 LayoutStatusArea(); | 29 LayoutStatusArea(); |
32 } | 30 } |
33 | 31 |
34 void StatusAreaLayoutManager::SetChildBounds( | 32 void StatusAreaLayoutManager::SetChildBounds( |
35 aura::Window* child, | 33 aura::Window* child, |
(...skipping 20 matching lines...) Expand all Loading... |
56 void StatusAreaLayoutManager::LayoutStatusArea() { | 54 void StatusAreaLayoutManager::LayoutStatusArea() { |
57 // Shelf layout manager may be already doing layout. | 55 // Shelf layout manager may be already doing layout. |
58 if (shelf_->shelf_layout_manager()->updating_bounds()) | 56 if (shelf_->shelf_layout_manager()->updating_bounds()) |
59 return; | 57 return; |
60 | 58 |
61 base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true); | 59 base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true); |
62 shelf_->shelf_layout_manager()->LayoutShelf(); | 60 shelf_->shelf_layout_manager()->LayoutShelf(); |
63 } | 61 } |
64 | 62 |
65 } // namespace ash | 63 } // namespace ash |
OLD | NEW |