diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 07:02:14 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 07:02:14 +0000 |
| commit | a5ac6dcaca8e8e69d8ec8156853cbe035fdb4964 (patch) | |
| tree | 30dae575da36ab840a604a9b1eb374c8efd063ad /chrome/renderer | |
| parent | ac55bfed12187c54c18152e54ddcec14d486b740 (diff) | |
| download | chromium_src-a5ac6dcaca8e8e69d8ec8156853cbe035fdb4964.zip chromium_src-a5ac6dcaca8e8e69d8ec8156853cbe035fdb4964.tar.gz chromium_src-a5ac6dcaca8e8e69d8ec8156853cbe035fdb4964.tar.bz2 | |
Now that RenderFrame is 1:1 with WebFrame, add the associated getters and start cleaning up assumptions.
BUG=304341
R=nasko@chromium.org
Review URL: https://codereview.chromium.org/138333006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/content_settings_observer.cc | 5 | ||||
| -rw-r--r-- | chrome/renderer/content_settings_observer.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index 62b6238..98a2898 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -155,6 +155,7 @@ ContentSettingsObserver::ContentSettingsObserver( is_interstitial_page_(false), npapi_plugins_blocked_(false) { ClearBlockedContentSettings(); + render_frame->GetWebFrame()->setPermissionClient(this); } ContentSettingsObserver::~ContentSettingsObserver() { @@ -183,10 +184,6 @@ void ContentSettingsObserver::DidBlockContentType( } } -void ContentSettingsObserver::WebFrameCreated(blink::WebFrame* frame) { - frame->setPermissionClient(this); -} - bool ContentSettingsObserver::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(ContentSettingsObserver, message) diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h index 40e2780..d31b5fd 100644 --- a/chrome/renderer/content_settings_observer.h +++ b/chrome/renderer/content_settings_observer.h @@ -100,7 +100,6 @@ class ContentSettingsObserver FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, PluginsTemporarilyAllowed); // RenderFrameObserver implementation. - virtual void WebFrameCreated(blink::WebFrame* frame) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; virtual void DidCommitProvisionalLoad(blink::WebFrame* frame, bool is_new_navigation) OVERRIDE; |