chrome/browser/tab_contents/render_view_host_delegate_helper.cc - Issue 8520036: Revert 110262 - Have ExtensionHost use TabContents instead of RenderViewHost. Try #2.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/tab_contents/render_view_host_delegate_helper.cc

Issue 8520036: Revert 110262 - Have ExtensionHost use TabContents instead of RenderViewHost. Try #2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_webnavigation_api.cc ('k') | chrome/browser/tab_contents/tab_contents_view_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/tab_contents/render_view_host_delegate_helper.cc

===================================================================

--- chrome/browser/tab_contents/render_view_host_delegate_helper.cc (revision 110269)

+++ chrome/browser/tab_contents/render_view_host_delegate_helper.cc (working copy)

@@ -549,8 +549,7 @@

if (service) {

const Extension* extension =

service->GetExtensionByURL(rvh->site_instance()->site());

- extension_webkit_preferences::SetPreferences(

- extension, rvh->delegate()->GetRenderViewType(), &web_prefs);

+ extension_webkit_preferences::SetPreferences(&web_prefs, extension);

}

if (rvh->delegate()->GetRenderViewType() == chrome::VIEW_TYPE_NOTIFICATION) {

Property changes on: chrome/browser/tab_contents/render_view_host_delegate_helper.cc

___________________________________________________________________

Added: svn:mergeinfo

« no previous file with comments | « chrome/browser/extensions/extension_webnavigation_api.cc ('k') | chrome/browser/tab_contents/tab_contents_view_mac.h » ('j') | no next file with comments »