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 "chrome/browser/chromeos/status/status_area_view.h" | 5 #include "chrome/browser/chromeos/status/status_area_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
12 #include "chrome/browser/chromeos/view_ids.h" | 12 #include "chrome/browser/chromeos/view_ids.h" |
13 #include "ui/gfx/canvas.h" | 13 #include "ui/gfx/canvas.h" |
14 #include "ui/views/border.h" | 14 #include "ui/views/border.h" |
15 | 15 |
16 #if defined(USE_AURA) | |
17 #include "ui/views/widget/widget.h" | |
18 #endif | |
19 | |
20 // Number of pixels to separate each icon. | 16 // Number of pixels to separate each icon. |
21 #if defined(TOUCH_UI) | 17 #if defined(TOUCH_UI) |
22 const int kSeparation = 25; | 18 const int kSeparation = 25; |
23 #else | 19 #else |
24 const int kSeparation = 0; | 20 const int kSeparation = 0; |
25 #endif | 21 #endif |
26 | 22 |
27 StatusAreaView::StatusAreaView() | 23 StatusAreaView::StatusAreaView() |
28 : need_return_focus_(false) { | 24 : need_return_focus_(false) { |
29 set_id(VIEW_ID_STATUS_AREA); | 25 set_id(VIEW_ID_STATUS_AREA); |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 } | 85 } |
90 } | 86 } |
91 } | 87 } |
92 | 88 |
93 void StatusAreaView::ChildPreferredSizeChanged(View* child) { | 89 void StatusAreaView::ChildPreferredSizeChanged(View* child) { |
94 // When something like the clock menu button's size changes, we need to | 90 // When something like the clock menu button's size changes, we need to |
95 // relayout. Also mark that this view's size has changed. This will let | 91 // relayout. Also mark that this view's size has changed. This will let |
96 // BrowserView know to relayout, which will reset the bounds of this view. | 92 // BrowserView know to relayout, which will reset the bounds of this view. |
97 Layout(); | 93 Layout(); |
98 PreferredSizeChanged(); | 94 PreferredSizeChanged(); |
99 #if defined(USE_AURA) | |
100 if (GetWidget()) | |
101 GetWidget()->SetSize(GetPreferredSize()); | |
102 #endif | |
103 } | 95 } |
104 | 96 |
105 void StatusAreaView::MakeButtonsActive(bool active) { | 97 void StatusAreaView::MakeButtonsActive(bool active) { |
106 for (std::list<StatusAreaButton*>::iterator iter = buttons_.begin(); | 98 for (std::list<StatusAreaButton*>::iterator iter = buttons_.begin(); |
107 iter != buttons_.end(); ++iter) { | 99 iter != buttons_.end(); ++iter) { |
108 (*iter)->set_menu_active(active); | 100 (*iter)->set_menu_active(active); |
109 } | 101 } |
110 } | 102 } |
111 | 103 |
112 void StatusAreaView::UpdateButtonVisibility() { | 104 void StatusAreaView::UpdateButtonVisibility() { |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 if (need_return_focus_) { | 137 if (need_return_focus_) { |
146 const views::View* first = GetFirstFocusableChild(); | 138 const views::View* first = GetFirstFocusableChild(); |
147 const views::View* last = GetLastFocusableChild(); | 139 const views::View* last = GetLastFocusableChild(); |
148 const bool first_to_last = (focused_before == first && focused_now == last); | 140 const bool first_to_last = (focused_before == first && focused_now == last); |
149 const bool last_to_first = (focused_now == first && focused_before == last); | 141 const bool last_to_first = (focused_now == first && focused_before == last); |
150 | 142 |
151 if (first_to_last || last_to_first) | 143 if (first_to_last || last_to_first) |
152 ReturnFocus(first_to_last); | 144 ReturnFocus(first_to_last); |
153 } | 145 } |
154 } | 146 } |
OLD | NEW |