Skip to content

Commit

Permalink
Remove ProcessManagerObserver::OnExtensionFrameNavigated
Browse files Browse the repository at this point in the history
This observer method isn't implemented by any object and it is dead code.

Bug: 
Change-Id: If81dd1b4e5dd3cdb4dacdf97f908ca6122163418
Reviewed-on: https://chromium-review.googlesource.com/525654
Reviewed-by: Nasko Oskov <nasko@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Nasko Oskov <nasko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#477451}
  • Loading branch information
naskooskov authored and Commit Bot committed Jun 6, 2017
1 parent 3629507 commit 7cdb0ae
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 27 deletions.
8 changes: 1 addition & 7 deletions extensions/browser/extension_web_contents_observer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,8 @@ void ExtensionWebContentsObserver::DidFinishNavigation(
const Extension* frame_extension =
GetExtensionFromFrame(render_frame_host, true);
if (pm->IsRenderFrameHostRegistered(render_frame_host)) {
if (frame_extension && !navigation_handle->IsSameDocument()) {
// Notify ProcessManager, because some clients do not just want to know
// whether the frame is in an extension process, but also whether the
// frame was navigated.
pm->DidNavigateRenderFrameHost(render_frame_host);
} else if (!frame_extension) {
if (!frame_extension)
pm->UnregisterRenderFrameHost(render_frame_host);
}
} else if (frame_extension) {
pm->RegisterRenderFrameHost(web_contents(), render_frame_host,
frame_extension);
Expand Down
13 changes: 0 additions & 13 deletions extensions/browser/process_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -292,19 +292,6 @@ void ProcessManager::UnregisterRenderFrameHost(
}
}

void ProcessManager::DidNavigateRenderFrameHost(
content::RenderFrameHost* render_frame_host) {
ExtensionRenderFrames::iterator frame =
all_extension_frames_.find(render_frame_host);

if (frame != all_extension_frames_.end()) {
std::string extension_id = GetExtensionID(render_frame_host);

for (auto& observer : observer_list_)
observer.OnExtensionFrameNavigated(extension_id, render_frame_host);
}
}

scoped_refptr<content::SiteInstance> ProcessManager::GetSiteInstanceForURL(
const GURL& url) {
return site_instance_->GetRelatedSiteInstance(url);
Expand Down
1 change: 0 additions & 1 deletion extensions/browser/process_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ class ProcessManager : public KeyedService,
content::RenderFrameHost* render_frame_host,
const Extension* extension);
void UnregisterRenderFrameHost(content::RenderFrameHost* render_frame_host);
void DidNavigateRenderFrameHost(content::RenderFrameHost* render_frame_host);

// Returns the SiteInstance that the given URL belongs to.
// TODO(aa): This only returns correct results for extensions and packaged
Expand Down
6 changes: 0 additions & 6 deletions extensions/browser/process_manager_observer.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ class ProcessManagerObserver {
virtual void OnExtensionFrameUnregistered(
const std::string& extension_id,
content::RenderFrameHost* render_frame_host) {}

// Called when a RenderFrameHost was navigated to another page within the
// extension process.
virtual void OnExtensionFrameNavigated(
const std::string& extension_id,
content::RenderFrameHost* render_frame_host) {}
};

} // namespace extensions
Expand Down

0 comments on commit 7cdb0ae

Please sign in to comment.