| Index: content/browser/renderer_host/render_view_host_impl.h
|
| diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
|
| index 250204e1488a813f898ba2bd5d4cee47aa0685ae..e2a97648b6317adaadf1d23a78f26b0530f14a46 100644
|
| --- a/content/browser/renderer_host/render_view_host_impl.h
|
| +++ b/content/browser/renderer_host/render_view_host_impl.h
|
| @@ -204,7 +204,6 @@
|
| virtual WebPreferences GetWebkitPreferences() OVERRIDE;
|
| virtual void UpdateWebkitPreferences(
|
| const WebPreferences& prefs) OVERRIDE;
|
| - virtual void OnWebkitPreferencesChanged() OVERRIDE;
|
| virtual void GetAudioOutputControllers(
|
| const GetAudioOutputControllersCallback& callback) const OVERRIDE;
|
| virtual void SelectWordAroundCaret() OVERRIDE;
|
| @@ -242,7 +241,7 @@
|
| }
|
|
|
| // Returns the content specific prefs for this RenderViewHost.
|
| - WebPreferences ComputeWebkitPrefs(const GURL& url);
|
| + WebPreferences GetWebkitPrefs(const GURL& url);
|
|
|
| // Sends the given navigation message. Use this rather than sending it
|
| // yourself since this does the internal bookkeeping described below. This
|
| @@ -608,11 +607,6 @@
|
| // True if the current focused element is editable.
|
| bool is_focused_element_editable_;
|
|
|
| - // This is updated every time UpdateWebkitPreferences is called. That method
|
| - // is in turn called when any of the settings change that the WebPreferences
|
| - // values depend on.
|
| - scoped_ptr<WebPreferences> web_preferences_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
|
| };
|
|
|
|
|