summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_view_impl.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-31 22:35:31 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-31 22:35:31 +0000
commitdaf82f8e54e875ad6e97aef6952ef181de65caeb (patch)
treeaec8a0a0117e8fac930ef5ca64773891a26e7e88 /content/renderer/render_view_impl.cc
parentc0a53a20b6e12ccf95d5c0c255c3987ae281cb5d (diff)
downloadchromium_src-daf82f8e54e875ad6e97aef6952ef181de65caeb.zip
chromium_src-daf82f8e54e875ad6e97aef6952ef181de65caeb.tar.gz
chromium_src-daf82f8e54e875ad6e97aef6952ef181de65caeb.tar.bz2
Move RendererPreferences to content/public/common and also put in the content namespace.
BUG=76697 Review URL: http://codereview.chromium.org/8432011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_impl.cc')
-rw-r--r--content/renderer/render_view_impl.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 79d2a40..47a602f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -35,7 +35,6 @@
#include "content/common/pepper_messages.h"
#include "content/common/pepper_plugin_registry.h"
#include "content/common/quota_dispatcher.h"
-#include "content/common/renderer_preferences.h"
#include "content/common/request_extra_data.h"
#include "content/common/view_messages.h"
#include "content/public/common/bindings_policy.h"
@@ -304,14 +303,15 @@ struct RenderViewImpl::PendingFileChooser {
WebFileChooserCompletion* completion; // MAY BE NULL to skip callback.
};
-RenderViewImpl::RenderViewImpl(gfx::NativeViewId parent_hwnd,
- int32 opener_id,
- const RendererPreferences& renderer_prefs,
- const WebPreferences& webkit_prefs,
- SharedRenderViewCounter* counter,
- int32 routing_id,
- int64 session_storage_namespace_id,
- const string16& frame_name)
+RenderViewImpl::RenderViewImpl(
+ gfx::NativeViewId parent_hwnd,
+ int32 opener_id,
+ const content::RendererPreferences& renderer_prefs,
+ const WebPreferences& webkit_prefs,
+ SharedRenderViewCounter* counter,
+ int32 routing_id,
+ int64 session_storage_namespace_id,
+ const string16& frame_name)
: RenderWidget(WebKit::WebPopupTypeNone),
webkit_preferences_(webkit_prefs),
send_content_state_immediately_(false),
@@ -476,7 +476,7 @@ void content::RenderView::ForEach(content::RenderViewVisitor* visitor) {
RenderViewImpl* RenderViewImpl::Create(
gfx::NativeViewId parent_hwnd,
int32 opener_id,
- const RendererPreferences& renderer_prefs,
+ const content::RendererPreferences& renderer_prefs,
const WebPreferences& webkit_prefs,
SharedRenderViewCounter* counter,
int32 routing_id,
@@ -3774,7 +3774,7 @@ void RenderViewImpl::OnDisableScrollbarsForSmallWindows(
}
void RenderViewImpl::OnSetRendererPrefs(
- const RendererPreferences& renderer_prefs) {
+ const content::RendererPreferences& renderer_prefs) {
renderer_preferences_ = renderer_prefs;
UpdateFontRenderingFromRendererPrefs();
#if defined(TOOLKIT_USES_GTK)