chrome/browser/chrome_content_browser_client.cc - Issue 357203003: Move webpreferences.* from webkit/ to content/

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/chrome_content_browser_client.cc

Issue 357203003: Move webpreferences.* from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Download patch

« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/extensions/extension_webkit_preferences.h » ('j') | content/content_common.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index e7847f655f797c8a42718e5c9eabc60b33550cc7..633ea92c87e6fd6927c78ea1e9530149d498e0a0 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -124,6 +124,7 @@

#include "content/public/common/child_process_host.h"

#include "content/public/common/content_descriptors.h"

#include "content/public/common/url_utils.h"

+#include "content/public/common/webpreferences.h"

#include "extensions/browser/extension_host.h"

#include "extensions/browser/extension_message_filter.h"

#include "extensions/browser/extension_registry.h"

@@ -152,7 +153,6 @@

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

#include "webkit/browser/fileapi/external_mount_points.h"

-#include "webkit/common/webpreferences.h"

#if defined(OS_WIN)

#include "base/win/windows_version.h"

@@ -263,6 +263,7 @@ using content::RenderFrameHost;

using content::RenderViewHost;

using content::SiteInstance;

using content::WebContents;

+using content::WebPreferences;

using extensions::APIPermission;

using extensions::Extension;

using extensions::InfoMap;

@@ -497,7 +498,7 @@ bool CertMatchesFilter(const net::X509Certificate& cert,

// Fills |map| with the per-script font prefs under path |map_name|.

void FillFontFamilyMap(const PrefService* prefs,

const char* map_name,

- webkit_glue::ScriptFontFamilyMap* map) {

+ content::ScriptFontFamilyMap* map) {

// TODO(falken): Get rid of the brute-force scan over possible

// (font family / script) combinations - see http://crbug.com/308095.

for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) {

« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/extensions/extension_webkit_preferences.h » ('j') | content/content_common.gypi » ('J')