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/extension_web_contents_observer.h" | 5 #include "extensions/browser/extension_web_contents_observer.h" |
6 | 6 |
7 #include "components/guest_view/browser/guest_view_base.h" | |
7 #include "content/public/browser/child_process_security_policy.h" | 8 #include "content/public/browser/child_process_security_policy.h" |
8 #include "content/public/browser/render_frame_host.h" | 9 #include "content/public/browser/render_frame_host.h" |
9 #include "content/public/browser/render_process_host.h" | 10 #include "content/public/browser/render_process_host.h" |
10 #include "content/public/browser/render_view_host.h" | 11 #include "content/public/browser/render_view_host.h" |
11 #include "content/public/browser/site_instance.h" | 12 #include "content/public/browser/site_instance.h" |
12 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
13 #include "content/public/common/url_constants.h" | 14 #include "content/public/common/url_constants.h" |
14 #include "extensions/browser/extension_prefs.h" | 15 #include "extensions/browser/extension_prefs.h" |
15 #include "extensions/browser/extension_registry.h" | 16 #include "extensions/browser/extension_registry.h" |
16 #include "extensions/browser/extensions_browser_client.h" | 17 #include "extensions/browser/extensions_browser_client.h" |
(...skipping 26 matching lines...) Expand all Loading... | |
43 } | 44 } |
44 | 45 |
45 ExtensionWebContentsObserver::~ExtensionWebContentsObserver() { | 46 ExtensionWebContentsObserver::~ExtensionWebContentsObserver() { |
46 } | 47 } |
47 | 48 |
48 void ExtensionWebContentsObserver::InitializeRenderFrame( | 49 void ExtensionWebContentsObserver::InitializeRenderFrame( |
49 content::RenderFrameHost* render_frame_host) { | 50 content::RenderFrameHost* render_frame_host) { |
50 DCHECK(render_frame_host); | 51 DCHECK(render_frame_host); |
51 DCHECK(render_frame_host->IsRenderFrameLive()); | 52 DCHECK(render_frame_host->IsRenderFrameLive()); |
52 | 53 |
54 ViewType view_type = GetViewType(web_contents()); | |
55 if (view_type == VIEW_TYPE_INVALID) { | |
56 // This is expected to happen only for non-extension pages (e.g. devtools) | |
57 // and GuestViews. | |
58 DCHECK(guest_view::GuestViewBase::FromWebContents(web_contents()) || | |
59 GetExtensionIdFromFrame(render_frame_host).empty()); | |
60 return; | |
61 } | |
53 // Notify the render frame of the view type. | 62 // Notify the render frame of the view type. |
54 render_frame_host->Send(new ExtensionMsg_NotifyRenderViewType( | 63 render_frame_host->Send(new ExtensionMsg_NotifyRenderViewType( |
55 render_frame_host->GetRoutingID(), GetViewType(web_contents()))); | 64 render_frame_host->GetRoutingID(), view_type)); |
56 | 65 |
57 const Extension* frame_extension = GetExtensionFromFrame(render_frame_host); | 66 const Extension* frame_extension = GetExtensionFromFrame(render_frame_host); |
58 if (frame_extension) { | 67 if (frame_extension) { |
59 ExtensionsBrowserClient::Get()->RegisterMojoServices(render_frame_host, | 68 ExtensionsBrowserClient::Get()->RegisterMojoServices(render_frame_host, |
60 frame_extension); | 69 frame_extension); |
61 ProcessManager::Get(browser_context_) | 70 ProcessManager::Get(browser_context_) |
62 ->RegisterRenderFrameHost(web_contents(), render_frame_host, | 71 ->RegisterRenderFrameHost(web_contents(), render_frame_host, |
63 frame_extension); | 72 frame_extension); |
64 } | 73 } |
65 } | 74 } |
(...skipping 28 matching lines...) Expand all Loading... | |
94 // the process level, not at the view level. However, without some mild | 103 // the process level, not at the view level. However, without some mild |
95 // refactoring this isn't trivial to do, and this way is simpler. | 104 // refactoring this isn't trivial to do, and this way is simpler. |
96 // | 105 // |
97 // Plus, we can delete the concept of activating an extension once site | 106 // Plus, we can delete the concept of activating an extension once site |
98 // isolation is turned on. | 107 // isolation is turned on. |
99 render_view_host->Send(new ExtensionMsg_ActivateExtension(extension->id())); | 108 render_view_host->Send(new ExtensionMsg_ActivateExtension(extension->id())); |
100 } | 109 } |
101 | 110 |
102 void ExtensionWebContentsObserver::RenderFrameCreated( | 111 void ExtensionWebContentsObserver::RenderFrameCreated( |
103 content::RenderFrameHost* render_frame_host) { | 112 content::RenderFrameHost* render_frame_host) { |
104 InitializeRenderFrame(render_frame_host); | 113 InitializeRenderFrame(render_frame_host); |
ncarter (slow)
2015/11/05 20:03:23
A couple layers down, InitializeRenderFrame calls
| |
105 } | 114 } |
106 | 115 |
107 void ExtensionWebContentsObserver::RenderFrameDeleted( | 116 void ExtensionWebContentsObserver::RenderFrameDeleted( |
108 content::RenderFrameHost* render_frame_host) { | 117 content::RenderFrameHost* render_frame_host) { |
109 ProcessManager::Get(browser_context_) | 118 ProcessManager::Get(browser_context_) |
110 ->UnregisterRenderFrameHost(render_frame_host); | 119 ->UnregisterRenderFrameHost(render_frame_host); |
111 } | 120 } |
112 | 121 |
122 void ExtensionWebContentsObserver::RenderFrameHostChanged( | |
123 content::RenderFrameHost* old_host, | |
124 content::RenderFrameHost* new_host) { | |
ncarter (slow)
2015/11/05 20:03:23
Do not override RenderFrameHostChanged. All you're
| |
125 // If the frame was opened by a non-extension frame, a process swap can occur. | |
126 // Before the process swap, RenderFrameCreated will be called, but | |
127 // InitializeRenderFrame will not consider the RenderFrameHost as an extension | |
128 // frame. Therefore we call this method again to ensure that the frame is | |
129 // registered if it is an extension frame. | |
130 if (new_host->IsRenderFrameLive()) | |
131 InitializeRenderFrame(new_host); | |
132 } | |
133 | |
134 void ExtensionWebContentsObserver::DidNavigateAnyFrame( | |
135 content::RenderFrameHost* render_frame_host, | |
136 const content::LoadCommittedDetails& details, | |
137 const content::FrameNavigateParams& params) { | |
ncarter (slow)
2015/11/05 20:03:23
It should be okay to call GetLastCommittedURL from
| |
138 if (details.is_in_page) | |
139 return; | |
140 | |
141 const Extension* frame_extension = GetExtensionFromFrame(render_frame_host); | |
142 if (frame_extension) { | |
143 // Notify ProcessManager, because some clients do not just want to know | |
144 // whether the frame is in an extension process, but also whether the frame | |
145 // was navigated. | |
146 ProcessManager::Get(browser_context_) | |
147 ->DidNavigateRenderFrameHost(render_frame_host); | |
148 } | |
149 } | |
150 | |
113 bool ExtensionWebContentsObserver::OnMessageReceived( | 151 bool ExtensionWebContentsObserver::OnMessageReceived( |
114 const IPC::Message& message, | 152 const IPC::Message& message, |
115 content::RenderFrameHost* render_frame_host) { | 153 content::RenderFrameHost* render_frame_host) { |
116 bool handled = true; | 154 bool handled = true; |
117 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM( | 155 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM( |
118 ExtensionWebContentsObserver, message, render_frame_host) | 156 ExtensionWebContentsObserver, message, render_frame_host) |
119 IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest) | 157 IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest) |
120 IPC_MESSAGE_UNHANDLED(handled = false) | 158 IPC_MESSAGE_UNHANDLED(handled = false) |
121 IPC_END_MESSAGE_MAP() | 159 IPC_END_MESSAGE_MAP() |
122 return handled; | 160 return handled; |
(...skipping 17 matching lines...) Expand all Loading... | |
140 const Extension* const extension = | 178 const Extension* const extension = |
141 process_manager->GetExtensionForWebContents(web_contents()); | 179 process_manager->GetExtensionForWebContents(web_contents()); |
142 if (extension) | 180 if (extension) |
143 process_manager->DecrementLazyKeepaliveCount(extension); | 181 process_manager->DecrementLazyKeepaliveCount(extension); |
144 } | 182 } |
145 } | 183 } |
146 | 184 |
147 std::string ExtensionWebContentsObserver::GetExtensionIdFromFrame( | 185 std::string ExtensionWebContentsObserver::GetExtensionIdFromFrame( |
148 content::RenderFrameHost* render_frame_host) const { | 186 content::RenderFrameHost* render_frame_host) const { |
149 content::SiteInstance* site_instance = render_frame_host->GetSiteInstance(); | 187 content::SiteInstance* site_instance = render_frame_host->GetSiteInstance(); |
150 GURL url = render_frame_host->GetLastCommittedURL(); | 188 GURL url = render_frame_host->GetLastCommittedURL(); |
ncarter (slow)
2015/11/05 20:03:23
My hunch is that we should remove this call to Get
| |
151 if (!url.is_empty()) { | 189 if (!url.is_empty()) { |
152 if (site_instance->GetSiteURL().GetOrigin() != url.GetOrigin()) | 190 if (site_instance->GetSiteURL().GetOrigin() != url.GetOrigin()) |
153 return std::string(); | 191 return std::string(); |
154 } else { | 192 } else { |
155 url = site_instance->GetSiteURL(); | 193 url = site_instance->GetSiteURL(); |
156 } | 194 } |
157 | 195 |
158 return url.SchemeIs(kExtensionScheme) ? url.host() : std::string(); | 196 return url.SchemeIs(kExtensionScheme) ? url.host() : std::string(); |
159 } | 197 } |
160 | 198 |
(...skipping 30 matching lines...) Expand all Loading... | |
191 | 229 |
192 return site.host(); | 230 return site.host(); |
193 } | 231 } |
194 | 232 |
195 void ExtensionWebContentsObserver::OnRequest( | 233 void ExtensionWebContentsObserver::OnRequest( |
196 content::RenderFrameHost* render_frame_host, | 234 content::RenderFrameHost* render_frame_host, |
197 const ExtensionHostMsg_Request_Params& params) { | 235 const ExtensionHostMsg_Request_Params& params) { |
198 dispatcher_.Dispatch(params, render_frame_host); | 236 dispatcher_.Dispatch(params, render_frame_host); |
199 } | 237 } |
200 | 238 |
201 void ExtensionWebContentsObserver::InitializeFrameHelper( | 239 void ExtensionWebContentsObserver::InitializeFrameHelper( |
ncarter (slow)
2015/11/05 20:03:23
FYI, from this function, it would also be okay to
| |
202 content::RenderFrameHost* render_frame_host) { | 240 content::RenderFrameHost* render_frame_host) { |
203 // Since this is called for all existing RenderFrameHosts during the | 241 // Since this is called for all existing RenderFrameHosts during the |
204 // ExtensionWebContentsObserver's creation, it's possible that not all hosts | 242 // ExtensionWebContentsObserver's creation, it's possible that not all hosts |
205 // are ready. | 243 // are ready. |
206 // We only initialize the frame if the renderer counterpart is live; otherwise | 244 // We only initialize the frame if the renderer counterpart is live; otherwise |
207 // we wait for the RenderFrameCreated notification. | 245 // we wait for the RenderFrameCreated notification. |
208 if (render_frame_host->IsRenderFrameLive()) | 246 if (render_frame_host->IsRenderFrameLive()) |
209 InitializeRenderFrame(render_frame_host); | 247 InitializeRenderFrame(render_frame_host); |
210 } | 248 } |
211 | 249 |
212 } // namespace extensions | 250 } // namespace extensions |
OLD | NEW |