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/system/user/tray_user.h" | 5 #include "ash/system/user/tray_user.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
9 #include "ash/session/session_state_delegate.h" | 9 #include "ash/session/session_state_delegate.h" |
10 #include "ash/shelf/shelf_layout_manager.h" | 10 #include "ash/shelf/shelf_layout_manager.h" |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 UpdateAvatarImage(status); | 184 UpdateAvatarImage(status); |
185 | 185 |
186 // Update layout after setting label_ and avatar_ with new login status. | 186 // Update layout after setting label_ and avatar_ with new login status. |
187 UpdateLayoutOfItem(); | 187 UpdateLayoutOfItem(); |
188 } | 188 } |
189 | 189 |
190 void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { | 190 void TrayUser::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { |
191 // Inactive users won't have a layout. | 191 // Inactive users won't have a layout. |
192 if (!layout_view_) | 192 if (!layout_view_) |
193 return; | 193 return; |
194 if (alignment == SHELF_ALIGNMENT_BOTTOM || | 194 if (alignment == SHELF_ALIGNMENT_BOTTOM) { |
195 alignment == SHELF_ALIGNMENT_TOP) { | |
196 if (avatar_) { | 195 if (avatar_) { |
197 avatar_->SetBorder(views::Border::NullBorder()); | 196 avatar_->SetBorder(views::Border::NullBorder()); |
198 avatar_->SetCornerRadii( | 197 avatar_->SetCornerRadii( |
199 0, kTrayAvatarCornerRadius, kTrayAvatarCornerRadius, 0); | 198 0, kTrayAvatarCornerRadius, kTrayAvatarCornerRadius, 0); |
200 } | 199 } |
201 if (label_) { | 200 if (label_) { |
202 // If label_ hasn't figured out its size yet, do that first. | 201 // If label_ hasn't figured out its size yet, do that first. |
203 if (label_->GetContentsBounds().height() == 0) | 202 if (label_->GetContentsBounds().height() == 0) |
204 label_->SizeToPreferredSize(); | 203 label_->SizeToPreferredSize(); |
205 int height = label_->GetContentsBounds().height(); | 204 int height = label_->GetContentsBounds().height(); |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 // Unit tests might come here with no images for some users. | 268 // Unit tests might come here with no images for some users. |
270 if (avatar_->size().IsEmpty()) | 269 if (avatar_->size().IsEmpty()) |
271 avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); | 270 avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize)); |
272 } | 271 } |
273 | 272 |
274 void TrayUser::UpdateLayoutOfItem() { | 273 void TrayUser::UpdateLayoutOfItem() { |
275 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment()); | 274 UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment()); |
276 } | 275 } |
277 | 276 |
278 } // namespace ash | 277 } // namespace ash |
OLD | NEW |