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 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
474 // Disable pinch zooming. | 474 // Disable pinch zooming. |
475 return event.type == blink::WebGestureEvent::GesturePinchBegin || | 475 return event.type == blink::WebGestureEvent::GesturePinchBegin || |
476 event.type == blink::WebGestureEvent::GesturePinchUpdate || | 476 event.type == blink::WebGestureEvent::GesturePinchUpdate || |
477 event.type == blink::WebGestureEvent::GesturePinchEnd; | 477 event.type == blink::WebGestureEvent::GesturePinchEnd; |
478 } | 478 } |
479 | 479 |
480 void WebUILoginView::DidFailProvisionalLoad( | 480 void WebUILoginView::DidFailProvisionalLoad( |
481 content::RenderFrameHost* render_frame_host, | 481 content::RenderFrameHost* render_frame_host, |
482 const GURL& validated_url, | 482 const GURL& validated_url, |
483 int error_code, | 483 int error_code, |
484 const base::string16& error_description) { | 484 const base::string16& error_description, |
| 485 bool was_ignored_by_handler) { |
485 FOR_EACH_OBSERVER(FrameObserver, | 486 FOR_EACH_OBSERVER(FrameObserver, |
486 frame_observer_list_, | 487 frame_observer_list_, |
487 OnFrameError(render_frame_host->GetFrameName())); | 488 OnFrameError(render_frame_host->GetFrameName())); |
488 if (render_frame_host->GetFrameName() != "gaia-frame") | 489 if (render_frame_host->GetFrameName() != "gaia-frame") |
489 return; | 490 return; |
490 | 491 |
491 GetWebUI()->CallJavascriptFunction("login.GaiaSigninScreen.onFrameError", | 492 GetWebUI()->CallJavascriptFunction("login.GaiaSigninScreen.onFrameError", |
492 base::FundamentalValue(-error_code), | 493 base::FundamentalValue(-error_code), |
493 base::StringValue(validated_url.spec())); | 494 base::StringValue(validated_url.spec())); |
494 } | 495 } |
(...skipping 14 matching lines...) Expand all Loading... |
509 webui_visible_ = true; | 510 webui_visible_ = true; |
510 } | 511 } |
511 | 512 |
512 void WebUILoginView::ReturnFocus(bool reverse) { | 513 void WebUILoginView::ReturnFocus(bool reverse) { |
513 // Return the focus to the web contents. | 514 // Return the focus to the web contents. |
514 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); | 515 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); |
515 GetWidget()->Activate(); | 516 GetWidget()->Activate(); |
516 } | 517 } |
517 | 518 |
518 } // namespace chromeos | 519 } // namespace chromeos |
OLD | NEW |