Chromium Code Reviews| 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 "chrome/browser/chromeos/login/webui_login_view.h" | 5 #include "chrome/browser/chromeos/login/webui_login_view.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/system/tray/system_tray.h" | 8 #include "ash/system/tray/system_tray.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 235 | 235 |
| 236 void WebUILoginView::OnPostponedShow() { | 236 void WebUILoginView::OnPostponedShow() { |
| 237 set_is_hidden(false); | 237 set_is_hidden(false); |
| 238 // If notification will happen later let it fire login-prompt-visible signal. | 238 // If notification will happen later let it fire login-prompt-visible signal. |
| 239 if (login_visible_notification_fired_) | 239 if (login_visible_notification_fired_) |
| 240 OnLoginPromptVisible(); | 240 OnLoginPromptVisible(); |
| 241 } | 241 } |
| 242 | 242 |
| 243 void WebUILoginView::SetStatusAreaVisible(bool visible) { | 243 void WebUILoginView::SetStatusAreaVisible(bool visible) { |
| 244 ash::SystemTray* tray = ash::Shell::GetInstance()->system_tray(); | 244 ash::SystemTray* tray = ash::Shell::GetInstance()->system_tray(); |
| 245 // TRACE_EVENT_ASYNC_BEGIN("OOBE", "SetStatusAreaVisible"); | |
|
Nikita (slow)
2012/08/29 14:10:01
cleanup
Ivan Korotkov
2012/08/30 12:26:06
Done.
| |
| 245 if (tray) { | 246 if (tray) { |
| 246 if (visible) { | 247 if (visible) { |
| 247 // Tray may have been initialized being hidden. | 248 // Tray may have been initialized being hidden. |
| 248 tray->SetVisible(visible); | 249 tray->SetVisible(visible); |
| 249 tray->GetWidget()->Show(); | 250 tray->GetWidget()->Show(); |
| 250 } else { | 251 } else { |
| 251 tray->GetWidget()->Hide(); | 252 tray->GetWidget()->Hide(); |
| 252 } | 253 } |
| 253 } | 254 } |
| 254 } | 255 } |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 372 aura::Env::GetInstance()->set_render_white_bg(true); | 373 aura::Env::GetInstance()->set_render_white_bg(true); |
| 373 } | 374 } |
| 374 | 375 |
| 375 void WebUILoginView::ReturnFocus(bool reverse) { | 376 void WebUILoginView::ReturnFocus(bool reverse) { |
| 376 // Return the focus to the web contents. | 377 // Return the focus to the web contents. |
| 377 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); | 378 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); |
| 378 GetWidget()->Activate(); | 379 GetWidget()->Activate(); |
| 379 } | 380 } |
| 380 | 381 |
| 381 } // namespace chromeos | 382 } // namespace chromeos |
| OLD | NEW |