Chromium Code Reviews| Index: chrome/browser/chromeos/login/webui_screen_locker.cc |
| diff --git a/chrome/browser/chromeos/login/webui_screen_locker.cc b/chrome/browser/chromeos/login/webui_screen_locker.cc |
| index a6798c7e1c246c550d6f49ddfbee7a4c7761e05c..f004489896e5084a662a2c657a032a40fd433d37 100644 |
| --- a/chrome/browser/chromeos/login/webui_screen_locker.cc |
| +++ b/chrome/browser/chromeos/login/webui_screen_locker.cc |
| @@ -14,6 +14,7 @@ |
| #include "chrome/browser/chromeos/login/screen_locker.h" |
| #include "chrome/browser/chromeos/login/user_manager.h" |
| #include "chrome/browser/chromeos/login/webui_login_display.h" |
| +#include "chrome/browser/chromeos/status/status_area_view_chromeos.h" |
| #include "chrome/browser/ui/views/dom_view.h" |
| #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" |
| #include "chrome/common/chrome_notification_types.h" |
| @@ -454,4 +455,29 @@ void WebUIScreenLocker::OnStartEnterpriseEnrollment() { |
| NOTREACHED(); |
| } |
| +//////////////////////////////////////////////////////////////////////////////// |
| +// WebUIScreenLocker, protected: |
| + |
| +void WebUIScreenLocker::Layout() { |
| + const int kCornerPadding = 5; |
| + WebUILoginView::Layout(); |
| + if (status_area_) { |
| + gfx::Size status_area_size = status_area_->GetPreferredSize(); |
| + status_area_->SetBounds( |
| + width() - status_area_size.width() - kCornerPadding, |
| + kCornerPadding, |
| + status_area_size.width(), |
| + status_area_size.height()); |
| + } |
| +} |
| + |
| +void WebUIScreenLocker::InitStatusArea() { |
| + DCHECK(status_area_ == NULL); |
| + status_area_ = new StatusAreaViewChromeos(); |
| + status_area_->Init(this); |
| + AddChildView(status_area_); |
| + status_area_->SetPaintToLayer(true); |
|
Nikita (slow)
2011/12/08 14:13:12
I see that you're adding status_area_ as a child v
flackr
2011/12/08 14:50:08
No, this didn't work.
|
| + Layout(); |
| +} |
| + |
| } // namespace chromeos |