content/browser/tab_contents/tab_contents.cc - Issue 8403024: Set extension-related webkit preferences in a common location.

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: content/browser/tab_contents/tab_contents.cc

Issue 8403024: Set extension-related webkit preferences in a common location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove is_web_ui param Created 9 years, 2 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:

Index: content/browser/tab_contents/tab_contents.cc

diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc

index fd84d52269e46fcb6c3ce231441186059c69411c..8a8c0adb3aa585aa74912edbc73c41e0b61cd662 100644

--- a/content/browser/tab_contents/tab_contents.cc

+++ b/content/browser/tab_contents/tab_contents.cc

@@ -1800,7 +1800,7 @@ void TabContents::RunBeforeUnloadConfirm(const RenderViewHost* rvh,

WebPreferences TabContents::GetWebkitPrefs() {

WebPreferences web_prefs =

content::GetContentClient()->browser()->GetWebkitPrefs(

- render_view_host()->process()->browser_context(), false);

+ render_view_host());

// Force accelerated compositing and 2d canvas off for chrome:, about: and

// chrome-devtools: pages (unless it's specifically allowed).

@@ -2006,4 +2006,3 @@ bool TabContents::GotResponseToLockMouseRequest(bool allowed) {

return render_view_host() ?

render_view_host()->GotResponseToLockMouseRequest(allowed) : false;

}