diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-10 16:20:31 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-10 16:20:31 +0000 |
| commit | a2ef54c1a1061112b48a583c466606ccf07dc28a (patch) | |
| tree | dbef7f9418364ac59bf9d32cde8be4da8a98b625 /chrome/renderer/content_settings_observer.cc | |
| parent | 037ffc68a78fd89048dfebc3c1d72b12eac1287e (diff) | |
| download | chromium_src-a2ef54c1a1061112b48a583c466606ccf07dc28a.zip chromium_src-a2ef54c1a1061112b48a583c466606ccf07dc28a.tar.gz chromium_src-a2ef54c1a1061112b48a583c466606ccf07dc28a.tar.bz2 | |
Make RenderView inherit from content::RenderView, and add missing functions to the interface. In a future change I'll rename RenderView to RenderViewImpl.
BUG=98716
Review URL: http://codereview.chromium.org/8201029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/content_settings_observer.cc')
| -rw-r--r-- | chrome/renderer/content_settings_observer.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index cac0470..5a97812 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -9,7 +9,7 @@ #include "content/common/database_messages.h" #include "content/common/view_messages.h" #include "content/public/renderer/navigation_state.h" -#include "content/renderer/render_view.h" +#include "content/public/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" @@ -56,7 +56,8 @@ static bool IsWhitelistedForContentSettings(WebFrame* frame) { ContentSettings ContentSettingsObserver::default_settings_; -ContentSettingsObserver::ContentSettingsObserver(RenderView* render_view) +ContentSettingsObserver::ContentSettingsObserver( + content::RenderView* render_view) : content::RenderViewObserver(render_view), content::RenderViewObserverTracker<ContentSettingsObserver>(render_view), plugins_temporarily_allowed_(false) { @@ -162,7 +163,8 @@ void ContentSettingsObserver::DidCommitProvisionalLoad( // The opener's view is not guaranteed to be non-null (it could be // detached from its page but not yet destructed). if (WebView* opener_view = frame->opener()->view()) { - RenderView* opener = RenderView::FromWebView(opener_view); + content::RenderView* opener = + content::RenderView::FromWebView(opener_view); ContentSettingsObserver* observer = ContentSettingsObserver::Get(opener); SetContentSettings(observer->current_content_settings_); } |