Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: extensions/browser/extension_web_contents_observer.cc

Issue 2716493004: Renamed NavigationHandle::IsSamePage to NavigationHandle::IsSameDocument (Closed)
Patch Set: Rebased Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "content/public/browser/child_process_security_policy.h" 7 #include "content/public/browser/child_process_security_policy.h"
8 #include "content/public/browser/navigation_handle.h" 8 #include "content/public/browser/navigation_handle.h"
9 #include "content/public/browser/render_frame_host.h" 9 #include "content/public/browser/render_frame_host.h"
10 #include "content/public/browser/render_process_host.h" 10 #include "content/public/browser/render_process_host.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 if (!navigation_handle->HasCommitted()) 140 if (!navigation_handle->HasCommitted())
141 return; 141 return;
142 142
143 ProcessManager* pm = ProcessManager::Get(browser_context_); 143 ProcessManager* pm = ProcessManager::Get(browser_context_);
144 144
145 content::RenderFrameHost* render_frame_host = 145 content::RenderFrameHost* render_frame_host =
146 navigation_handle->GetRenderFrameHost(); 146 navigation_handle->GetRenderFrameHost();
147 const Extension* frame_extension = 147 const Extension* frame_extension =
148 GetExtensionFromFrame(render_frame_host, true); 148 GetExtensionFromFrame(render_frame_host, true);
149 if (pm->IsRenderFrameHostRegistered(render_frame_host)) { 149 if (pm->IsRenderFrameHostRegistered(render_frame_host)) {
150 if (frame_extension && !navigation_handle->IsSamePage()) { 150 if (frame_extension && !navigation_handle->IsSameDocument()) {
151 // Notify ProcessManager, because some clients do not just want to know 151 // Notify ProcessManager, because some clients do not just want to know
152 // whether the frame is in an extension process, but also whether the 152 // whether the frame is in an extension process, but also whether the
153 // frame was navigated. 153 // frame was navigated.
154 pm->DidNavigateRenderFrameHost(render_frame_host); 154 pm->DidNavigateRenderFrameHost(render_frame_host);
155 } else if (!frame_extension) { 155 } else if (!frame_extension) {
156 pm->UnregisterRenderFrameHost(render_frame_host); 156 pm->UnregisterRenderFrameHost(render_frame_host);
157 } 157 }
158 } else if (frame_extension) { 158 } else if (frame_extension) {
159 pm->RegisterRenderFrameHost(web_contents(), render_frame_host, 159 pm->RegisterRenderFrameHost(web_contents(), render_frame_host,
160 frame_extension); 160 frame_extension);
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 // Since this is called for all existing RenderFrameHosts during the 273 // Since this is called for all existing RenderFrameHosts during the
274 // ExtensionWebContentsObserver's creation, it's possible that not all hosts 274 // ExtensionWebContentsObserver's creation, it's possible that not all hosts
275 // are ready. 275 // are ready.
276 // We only initialize the frame if the renderer counterpart is live; otherwise 276 // We only initialize the frame if the renderer counterpart is live; otherwise
277 // we wait for the RenderFrameCreated notification. 277 // we wait for the RenderFrameCreated notification.
278 if (render_frame_host->IsRenderFrameLive()) 278 if (render_frame_host->IsRenderFrameLive())
279 InitializeRenderFrame(render_frame_host); 279 InitializeRenderFrame(render_frame_host);
280 } 280 }
281 281
282 } // namespace extensions 282 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698