Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Unified Diff: content/renderer/render_view_impl.h

Issue 10384128: Quote WebPreferences in namespace webkit_glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copyright 2012 Created 8 years, 7 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 | « content/renderer/render_view_browsertest_mac.mm ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 8e5522a2db4342d4d1409dee4717c2177cebe7bd..42cb01168c1f0ab047d835ba01486559cd118fa1 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -187,7 +187,7 @@ class RenderViewImpl : public RenderWidget,
gfx::NativeViewId parent_hwnd,
int32 opener_id,
const content::RendererPreferences& renderer_prefs,
- const WebPreferences& webkit_prefs,
+ const webkit_glue::WebPreferences& webkit_prefs,
SharedRenderViewCounter* counter,
int32 routing_id,
int32 surface_id,
@@ -216,7 +216,7 @@ class RenderViewImpl : public RenderWidget,
int history_list_offset() const { return history_list_offset_; }
- const WebPreferences& webkit_preferences() const {
+ const webkit_glue::WebPreferences& webkit_preferences() const {
return webkit_preferences_;
}
@@ -610,7 +610,7 @@ class RenderViewImpl : public RenderWidget,
virtual int GetPageId() const OVERRIDE;
virtual gfx::Size GetSize() const OVERRIDE;
virtual gfx::NativeViewId GetHostWindow() const OVERRIDE;
- virtual WebPreferences& GetWebkitPreferences() OVERRIDE;
+ virtual webkit_glue::WebPreferences& GetWebkitPreferences() OVERRIDE;
virtual WebKit::WebView* GetWebView() OVERRIDE;
virtual WebKit::WebNode GetFocusedNode() const OVERRIDE;
virtual WebKit::WebNode GetContextMenuNode() const OVERRIDE;
@@ -743,7 +743,7 @@ class RenderViewImpl : public RenderWidget,
RenderViewImpl(gfx::NativeViewId parent_hwnd,
int32 opener_id,
const content::RendererPreferences& renderer_prefs,
- const WebPreferences& webkit_prefs,
+ const webkit_glue::WebPreferences& webkit_prefs,
SharedRenderViewCounter* counter,
int32 routing_id,
int32 surface_id,
@@ -912,7 +912,8 @@ class RenderViewImpl : public RenderWidget,
void OnThemeChanged();
void OnUndo();
void OnUpdateTargetURLAck();
- CONTENT_EXPORT void OnUpdateWebPreferences(const WebPreferences& prefs);
+ CONTENT_EXPORT void OnUpdateWebPreferences(
+ const webkit_glue::WebPreferences& prefs);
#if defined(OS_MACOSX)
void OnWindowFrameChanged(const gfx::Rect& window_frame,
@@ -1033,7 +1034,7 @@ class RenderViewImpl : public RenderWidget,
// Settings ------------------------------------------------------------------
- WebPreferences webkit_preferences_;
+ webkit_glue::WebPreferences webkit_preferences_;
content::RendererPreferences renderer_preferences_;
HostZoomLevels host_zoom_levels_;
« no previous file with comments | « content/renderer/render_view_browsertest_mac.mm ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698