| 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" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 PreferredSizeChanged(); | 98 PreferredSizeChanged(); |
| 99 #if defined(USE_AURA) | 99 #if defined(USE_AURA) |
| 100 if (GetWidget()) | 100 if (GetWidget()) |
| 101 GetWidget()->SetSize(GetPreferredSize()); | 101 GetWidget()->SetSize(GetPreferredSize()); |
| 102 #endif | 102 #endif |
| 103 } | 103 } |
| 104 | 104 |
| 105 void StatusAreaView::MakeButtonsActive(bool active) { | 105 void StatusAreaView::MakeButtonsActive(bool active) { |
| 106 for (std::list<StatusAreaButton*>::iterator iter = buttons_.begin(); | 106 for (std::list<StatusAreaButton*>::iterator iter = buttons_.begin(); |
| 107 iter != buttons_.end(); ++iter) { | 107 iter != buttons_.end(); ++iter) { |
| 108 (*iter)->set_menu_active(active); | 108 (*iter)->SetMenuActive(active); |
| 109 } | 109 } |
| 110 } | 110 } |
| 111 | 111 |
| 112 void StatusAreaView::UpdateButtonVisibility() { | 112 void StatusAreaView::UpdateButtonVisibility() { |
| 113 Layout(); | 113 Layout(); |
| 114 PreferredSizeChanged(); | 114 PreferredSizeChanged(); |
| 115 } | 115 } |
| 116 | 116 |
| 117 void StatusAreaView::TakeFocus( | 117 void StatusAreaView::TakeFocus( |
| 118 bool reverse, | 118 bool reverse, |
| (...skipping 26 matching lines...) Expand all Loading... |
| 145 if (need_return_focus_) { | 145 if (need_return_focus_) { |
| 146 const views::View* first = GetFirstFocusableChild(); | 146 const views::View* first = GetFirstFocusableChild(); |
| 147 const views::View* last = GetLastFocusableChild(); | 147 const views::View* last = GetLastFocusableChild(); |
| 148 const bool first_to_last = (focused_before == first && focused_now == last); | 148 const bool first_to_last = (focused_before == first && focused_now == last); |
| 149 const bool last_to_first = (focused_now == first && focused_before == last); | 149 const bool last_to_first = (focused_now == first && focused_before == last); |
| 150 | 150 |
| 151 if (first_to_last || last_to_first) | 151 if (first_to_last || last_to_first) |
| 152 ReturnFocus(first_to_last); | 152 ReturnFocus(first_to_last); |
| 153 } | 153 } |
| 154 } | 154 } |
| OLD | NEW |