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 "extensions/browser/guest_view/web_view/web_view_guest.h" | 5 #include "extensions/browser/guest_view/web_view/web_view_guest.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "components/browsing_data/storage_partition_http_cache_data_remover.h" | 10 #include "components/browsing_data/storage_partition_http_cache_data_remover.h" |
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
804 DispatchEventToView( | 804 DispatchEventToView( |
805 new GuestViewEvent(webview::kEventLoadCommit, args.Pass())); | 805 new GuestViewEvent(webview::kEventLoadCommit, args.Pass())); |
806 | 806 |
807 find_helper_.CancelAllFindSessions(); | 807 find_helper_.CancelAllFindSessions(); |
808 } | 808 } |
809 | 809 |
810 void WebViewGuest::DidFailProvisionalLoad( | 810 void WebViewGuest::DidFailProvisionalLoad( |
811 content::RenderFrameHost* render_frame_host, | 811 content::RenderFrameHost* render_frame_host, |
812 const GURL& validated_url, | 812 const GURL& validated_url, |
813 int error_code, | 813 int error_code, |
814 const base::string16& error_description) { | 814 const base::string16& error_description, |
| 815 bool was_ignored_by_handler) { |
815 LoadAbort(!render_frame_host->GetParent(), validated_url, error_code, | 816 LoadAbort(!render_frame_host->GetParent(), validated_url, error_code, |
816 net::ErrorToShortString(error_code)); | 817 net::ErrorToShortString(error_code)); |
817 } | 818 } |
818 | 819 |
819 void WebViewGuest::DidStartProvisionalLoadForFrame( | 820 void WebViewGuest::DidStartProvisionalLoadForFrame( |
820 content::RenderFrameHost* render_frame_host, | 821 content::RenderFrameHost* render_frame_host, |
821 const GURL& validated_url, | 822 const GURL& validated_url, |
822 bool is_error_page, | 823 bool is_error_page, |
823 bool is_iframe_srcdoc) { | 824 bool is_iframe_srcdoc) { |
824 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); | 825 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1456 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); | 1457 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
1457 DispatchEventToView( | 1458 DispatchEventToView( |
1458 new GuestViewEvent(webview::kEventExitFullscreen, args.Pass())); | 1459 new GuestViewEvent(webview::kEventExitFullscreen, args.Pass())); |
1459 } | 1460 } |
1460 // Since we changed fullscreen state, sending a Resize message ensures that | 1461 // Since we changed fullscreen state, sending a Resize message ensures that |
1461 // renderer/ sees the change. | 1462 // renderer/ sees the change. |
1462 web_contents()->GetRenderViewHost()->WasResized(); | 1463 web_contents()->GetRenderViewHost()->WasResized(); |
1463 } | 1464 } |
1464 | 1465 |
1465 } // namespace extensions | 1466 } // namespace extensions |
OLD | NEW |