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/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "grit/ash_strings.h" | 10 #include "grit/ash_strings.h" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 explicit UserView(ash::user::LoginStatus status) | 97 explicit UserView(ash::user::LoginStatus status) |
98 : username_(NULL), | 98 : username_(NULL), |
99 email_(NULL), | 99 email_(NULL), |
100 update_(NULL), | 100 update_(NULL), |
101 shutdown_(NULL), | 101 shutdown_(NULL), |
102 signout_(NULL), | 102 signout_(NULL), |
103 lock_(NULL) { | 103 lock_(NULL) { |
104 CHECK(status != ash::user::LOGGED_IN_NONE); | 104 CHECK(status != ash::user::LOGGED_IN_NONE); |
105 SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, | 105 SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, |
106 0, 0, 0)); | 106 0, 0, 0)); |
| 107 set_background(views::Background::CreateSolidBackground(SK_ColorWHITE)); |
107 | 108 |
108 if (status != ash::user::LOGGED_IN_GUEST) | 109 if (status != ash::user::LOGGED_IN_GUEST) |
109 AddUserInfo(); | 110 AddUserInfo(); |
110 | 111 |
111 views::View* button_container = new views::View; | 112 views::View* button_container = new views::View; |
112 views::BoxLayout *layout = new | 113 views::BoxLayout *layout = new |
113 views::BoxLayout(views::BoxLayout::kHorizontal, | 114 views::BoxLayout(views::BoxLayout::kHorizontal, |
114 kPaddingAroundButtons, | 115 kPaddingAroundButtons, |
115 kPaddingAroundButtons, | 116 kPaddingAroundButtons, |
116 -1); | 117 -1); |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 void TrayUser::DestroyDetailedView() { | 286 void TrayUser::DestroyDetailedView() { |
286 } | 287 } |
287 | 288 |
288 void TrayUser::OnUpdateRecommended() { | 289 void TrayUser::OnUpdateRecommended() { |
289 if (user_.get()) | 290 if (user_.get()) |
290 user_->RefreshForUpdate(); | 291 user_->RefreshForUpdate(); |
291 } | 292 } |
292 | 293 |
293 } // namespace internal | 294 } // namespace internal |
294 } // namespace ash | 295 } // namespace ash |
OLD | NEW |