chrome/browser/extensions/extension_host.cc - Issue 479006: re-apply r34183...

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/extensions/extension_host.cc

Issue 479006: re-apply r34183... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years 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: chrome/browser/extensions/extension_host.cc

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

--- chrome/browser/extensions/extension_host.cc (revision 34187)

+++ chrome/browser/extensions/extension_host.cc (working copy)

@@ -27,12 +27,12 @@

#include "chrome/browser/renderer_host/render_widget_host.h"

#include "chrome/browser/renderer_host/render_widget_host_view.h"

#include "chrome/browser/renderer_host/site_instance.h"

+#include "chrome/browser/renderer_preferences_util.h"

#include "chrome/browser/tab_contents/tab_contents.h"

#include "chrome/browser/tab_contents/tab_contents_view.h"

#include "chrome/common/bindings_policy.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/notification_service.h"

-#include "chrome/common/platform_util.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/pref_service.h"

#include "chrome/common/view_types.h"

@@ -415,8 +415,8 @@

}

-RendererPreferences ExtensionHost::GetRendererPrefs() const {

- return platform_util::GetInitedRendererPreferences();

+RendererPreferences ExtensionHost::GetRendererPrefs(Profile* profile) const {

+ return renderer_preferences_util::GetInitedRendererPreferences(profile);

}

WebPreferences ExtensionHost::GetWebkitPrefs() {

« no previous file with comments | « chrome/browser/extensions/extension_host.h ('k') | chrome/browser/gtk/gtk_theme_provider.h » ('j') | no next file with comments »