diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 23:27:34 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 23:27:34 +0000 |
commit | 1c0482501ebb615f594cb70c62b03a2290971e40 (patch) | |
tree | e280a78c94cd94e9f2b9b56b05b3d8f31b63828b | |
parent | ba588a8ff55f5e54d140a7431185f71f77d94b69 (diff) | |
download | chromium_src-1c0482501ebb615f594cb70c62b03a2290971e40.zip chromium_src-1c0482501ebb615f594cb70c62b03a2290971e40.tar.gz chromium_src-1c0482501ebb615f594cb70c62b03a2290971e40.tar.bz2 |
Implement RenderFrameImpl::notificationPresenter in preparation for moving notifications to use RenderFrames.
BUG=304341
R=nasko@chromium.org
Review URL: https://codereview.chromium.org/235903002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263401 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | content/renderer/render_frame_impl.cc | 5 | ||||
-rw-r--r-- | content/renderer/render_frame_impl.h | 2 | ||||
-rw-r--r-- | content/shell/renderer/test_runner/WebFrameTestProxy.h | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index ed162d3..aeb6204 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -55,6 +55,7 @@ #include "content/renderer/internal_document_state_data.h" #include "content/renderer/java/java_bridge_dispatcher.h" #include "content/renderer/media/webcontentdecryptionmodule_impl.h" +#include "content/renderer/notification_provider.h" #include "content/renderer/npapi/plugin_channel_host.h" #include "content/renderer/render_process.h" #include "content/renderer/render_thread_impl.h" @@ -2033,6 +2034,10 @@ void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) { render_view_->didUpdateCurrentHistoryItem(frame); } +blink::WebNotificationPresenter* RenderFrameImpl::notificationPresenter() { + return render_view_->notification_provider_; +} + void RenderFrameImpl::didChangeSelection(bool is_empty_selection) { if (!GetRenderWidget()->handling_input_event() && !handling_select_range_) return; diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h index dc3b77a..4465069 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h @@ -33,6 +33,7 @@ namespace blink { class WebInputEvent; class WebMouseEvent; class WebContentDecryptionModule; +class WebNotificationPresenter; class WebSecurityOrigin; struct WebCompositionUnderline; struct WebContextMenuData; @@ -287,6 +288,7 @@ class CONTENT_EXPORT RenderFrameImpl virtual void didNavigateWithinPage(blink::WebLocalFrame* frame, bool is_new_navigation); virtual void didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame); + virtual blink::WebNotificationPresenter* notificationPresenter(); virtual void didChangeSelection(bool is_empty_selection); virtual blink::WebColorChooser* createColorChooser( blink::WebColorChooserClient* client, diff --git a/content/shell/renderer/test_runner/WebFrameTestProxy.h b/content/shell/renderer/test_runner/WebFrameTestProxy.h index 1b2d221..17f7ed6 100644 --- a/content/shell/renderer/test_runner/WebFrameTestProxy.h +++ b/content/shell/renderer/test_runner/WebFrameTestProxy.h @@ -101,6 +101,10 @@ public: { Base::didFinishLoad(frame); } + virtual blink::WebNotificationPresenter* notificationPresenter() + { + return m_baseProxy->notificationPresenter(); + } virtual void didChangeSelection(bool is_selection_empty) { m_baseProxy->didChangeSelection(is_selection_empty); Base::didChangeSelection(is_selection_empty); |