| Index: content/renderer/render_view_impl.h
|
| diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
|
| index 96f52f66d0ff039da1b810d33c746963b9f8e8e1..57bb46ddb94456f07844d510870b1050395cce18 100644
|
| --- a/content/renderer/render_view_impl.h
|
| +++ b/content/renderer/render_view_impl.h
|
| @@ -34,6 +34,7 @@
|
| #include "content/public/common/renderer_preferences.h"
|
| #include "content/public/common/stop_find_action.h"
|
| #include "content/public/common/top_controls_state.h"
|
| +#include "content/public/common/web_preferences.h"
|
| #include "content/public/renderer/render_view.h"
|
| #include "content/renderer/mouse_lock_dispatcher.h"
|
| #include "content/renderer/render_frame_impl.h"
|
| @@ -56,7 +57,6 @@
|
| #include "third_party/WebKit/public/web/WebViewClient.h"
|
| #include "ui/base/window_open_disposition.h"
|
| #include "ui/surface/transport_dib.h"
|
| -#include "webkit/common/webpreferences.h"
|
|
|
| #if defined(OS_ANDROID)
|
| #include "content/renderer/android/content_detector.h"
|
| @@ -484,6 +484,7 @@ class CONTENT_EXPORT RenderViewImpl
|
| virtual gfx::Size GetSize() const OVERRIDE;
|
| virtual WebPreferences& GetWebkitPreferences() OVERRIDE;
|
| virtual void SetWebkitPreferences(const WebPreferences& preferences) OVERRIDE;
|
| + virtual void ApplyWebPreferences(const WebPreferences& preferences) OVERRIDE;
|
| virtual blink::WebView* GetWebView() OVERRIDE;
|
| virtual blink::WebElement GetFocusedElement() const OVERRIDE;
|
| virtual bool IsEditableNode(const blink::WebNode& node) const OVERRIDE;
|
|
|