| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/extension_view/extension_view_guest.h" | 5 #include "extensions/browser/guest_view/extension_view/extension_view_guest.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "components/crx_file/id_util.h" | 9 #include "components/crx_file/id_util.h" |
| 10 #include "components/guest_view/browser/guest_view_event.h" | 10 #include "components/guest_view/browser/guest_view_event.h" |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 content::RenderFrameHost* render_frame_host, | 121 content::RenderFrameHost* render_frame_host, |
| 122 const GURL& url, | 122 const GURL& url, |
| 123 ui::PageTransition transition_type) { | 123 ui::PageTransition transition_type) { |
| 124 if (render_frame_host->GetParent()) | 124 if (render_frame_host->GetParent()) |
| 125 return; | 125 return; |
| 126 | 126 |
| 127 url_ = url; | 127 url_ = url; |
| 128 | 128 |
| 129 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); | 129 scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
| 130 args->SetString(guest_view::kUrl, url_.spec()); | 130 args->SetString(guest_view::kUrl, url_.spec()); |
| 131 DispatchEventToView( | 131 DispatchEventToView(make_scoped_ptr( |
| 132 new GuestViewEvent(extensionview::kEventLoadCommit, std::move(args))); | 132 new GuestViewEvent(extensionview::kEventLoadCommit, std::move(args)))); |
| 133 } | 133 } |
| 134 | 134 |
| 135 void ExtensionViewGuest::DidNavigateMainFrame( | 135 void ExtensionViewGuest::DidNavigateMainFrame( |
| 136 const content::LoadCommittedDetails& details, | 136 const content::LoadCommittedDetails& details, |
| 137 const content::FrameNavigateParams& params) { | 137 const content::FrameNavigateParams& params) { |
| 138 if (attached() && (params.url.GetOrigin() != url_.GetOrigin())) { | 138 if (attached() && (params.url.GetOrigin() != url_.GetOrigin())) { |
| 139 bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(), | 139 bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(), |
| 140 bad_message::EVG_BAD_ORIGIN); | 140 bad_message::EVG_BAD_ORIGIN); |
| 141 } | 141 } |
| 142 } | 142 } |
| 143 | 143 |
| 144 void ExtensionViewGuest::ApplyAttributes(const base::DictionaryValue& params) { | 144 void ExtensionViewGuest::ApplyAttributes(const base::DictionaryValue& params) { |
| 145 std::string src; | 145 std::string src; |
| 146 params.GetString(extensionview::kAttributeSrc, &src); | 146 params.GetString(extensionview::kAttributeSrc, &src); |
| 147 NavigateGuest(src, false /* force_navigation */); | 147 NavigateGuest(src, false /* force_navigation */); |
| 148 } | 148 } |
| 149 | 149 |
| 150 } // namespace extensions | 150 } // namespace extensions |
| OLD | NEW |