OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ui/webui_login_view.h" | 5 #include "chrome/browser/chromeos/login/ui/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 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 return; | 452 return; |
453 | 453 |
454 GetWebUI()->CallJavascriptFunction("login.GaiaSigninScreen.onFrameError", | 454 GetWebUI()->CallJavascriptFunction("login.GaiaSigninScreen.onFrameError", |
455 base::FundamentalValue(-error_code), | 455 base::FundamentalValue(-error_code), |
456 base::StringValue(validated_url.spec())); | 456 base::StringValue(validated_url.spec())); |
457 } | 457 } |
458 | 458 |
459 void WebUILoginView::OnLoginPromptVisible() { | 459 void WebUILoginView::OnLoginPromptVisible() { |
460 // If we're hidden than will generate this signal once we're shown. | 460 // If we're hidden than will generate this signal once we're shown. |
461 if (is_hidden_ || webui_visible_) { | 461 if (is_hidden_ || webui_visible_) { |
462 LOG(WARNING) << "Login WebUI >> not emitting signal, hidden: " | 462 VLOG(1) << "Login WebUI >> not emitting signal, hidden: " << is_hidden_; |
463 << is_hidden_; | |
464 return; | 463 return; |
465 } | 464 } |
466 TRACE_EVENT0("chromeos", "WebUILoginView::OnLoginPromoptVisible"); | 465 TRACE_EVENT0("chromeos", "WebUILoginView::OnLoginPromoptVisible"); |
467 if (should_emit_login_prompt_visible_) { | 466 if (should_emit_login_prompt_visible_) { |
468 LOG(WARNING) << "Login WebUI >> login-prompt-visible"; | 467 VLOG(1) << "Login WebUI >> login-prompt-visible"; |
469 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> | 468 chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> |
470 EmitLoginPromptVisible(); | 469 EmitLoginPromptVisible(); |
471 } | 470 } |
472 | 471 |
473 webui_visible_ = true; | 472 webui_visible_ = true; |
474 } | 473 } |
475 | 474 |
476 void WebUILoginView::ReturnFocus(bool reverse) { | 475 void WebUILoginView::ReturnFocus(bool reverse) { |
477 // Return the focus to the web contents. | 476 // Return the focus to the web contents. |
478 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); | 477 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); |
479 GetWidget()->Activate(); | 478 GetWidget()->Activate(); |
480 } | 479 } |
481 | 480 |
482 } // namespace chromeos | 481 } // namespace chromeos |
OLD | NEW |