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 "content/public/browser/browser_context.h" | 10 #include "content/public/browser/browser_context.h" |
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
638 web_view_guest_delegate_.reset( | 638 web_view_guest_delegate_.reset( |
639 ExtensionsAPIClient::Get()->CreateWebViewGuestDelegate(this)); | 639 ExtensionsAPIClient::Get()->CreateWebViewGuestDelegate(this)); |
640 } | 640 } |
641 | 641 |
642 WebViewGuest::~WebViewGuest() { | 642 WebViewGuest::~WebViewGuest() { |
643 } | 643 } |
644 | 644 |
645 void WebViewGuest::DidCommitProvisionalLoadForFrame( | 645 void WebViewGuest::DidCommitProvisionalLoadForFrame( |
646 content::RenderFrameHost* render_frame_host, | 646 content::RenderFrameHost* render_frame_host, |
647 const GURL& url, | 647 const GURL& url, |
| 648 bool url_is_unreachable, |
648 ui::PageTransition transition_type) { | 649 ui::PageTransition transition_type) { |
649 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); | 650 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
650 args->SetString(guestview::kUrl, url.spec()); | 651 args->SetString(guestview::kUrl, url.spec()); |
651 args->SetBoolean(guestview::kIsTopLevel, !render_frame_host->GetParent()); | 652 args->SetBoolean(guestview::kIsTopLevel, !render_frame_host->GetParent()); |
652 args->SetInteger(webview::kInternalCurrentEntryIndex, | 653 args->SetInteger(webview::kInternalCurrentEntryIndex, |
653 web_contents()->GetController().GetCurrentEntryIndex()); | 654 web_contents()->GetController().GetCurrentEntryIndex()); |
654 args->SetInteger(webview::kInternalEntryCount, | 655 args->SetInteger(webview::kInternalEntryCount, |
655 web_contents()->GetController().GetEntryCount()); | 656 web_contents()->GetController().GetEntryCount()); |
656 args->SetInteger(webview::kInternalProcessId, | 657 args->SetInteger(webview::kInternalProcessId, |
657 web_contents()->GetRenderProcessHost()->GetID()); | 658 web_contents()->GetRenderProcessHost()->GetID()); |
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1130 WebViewGuest* guest = | 1131 WebViewGuest* guest = |
1131 WebViewGuest::From(embedder_render_process_id(), new_window_instance_id); | 1132 WebViewGuest::From(embedder_render_process_id(), new_window_instance_id); |
1132 if (!guest) | 1133 if (!guest) |
1133 return; | 1134 return; |
1134 | 1135 |
1135 if (!allow) | 1136 if (!allow) |
1136 guest->Destroy(); | 1137 guest->Destroy(); |
1137 } | 1138 } |
1138 | 1139 |
1139 } // namespace extensions | 1140 } // namespace extensions |
OLD | NEW |