Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(288)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 186023002: DO NOT REVIEW Plumb push messaging registration through to gcm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | ipc/ipc_message_start.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 #include "content/renderer/media/media_stream_impl.h" 97 #include "content/renderer/media/media_stream_impl.h"
98 #include "content/renderer/media/midi_dispatcher.h" 98 #include "content/renderer/media/midi_dispatcher.h"
99 #include "content/renderer/media/render_media_log.h" 99 #include "content/renderer/media/render_media_log.h"
100 #include "content/renderer/media/video_capture_impl_manager.h" 100 #include "content/renderer/media/video_capture_impl_manager.h"
101 #include "content/renderer/media/webmediaplayer_impl.h" 101 #include "content/renderer/media/webmediaplayer_impl.h"
102 #include "content/renderer/media/webmediaplayer_ms.h" 102 #include "content/renderer/media/webmediaplayer_ms.h"
103 #include "content/renderer/media/webmediaplayer_params.h" 103 #include "content/renderer/media/webmediaplayer_params.h"
104 #include "content/renderer/memory_benchmarking_extension.h" 104 #include "content/renderer/memory_benchmarking_extension.h"
105 #include "content/renderer/mhtml_generator.h" 105 #include "content/renderer/mhtml_generator.h"
106 #include "content/renderer/notification_provider.h" 106 #include "content/renderer/notification_provider.h"
107 #include "content/renderer/push_messaging_dispatcher.h"
107 #include "content/renderer/render_frame_impl.h" 108 #include "content/renderer/render_frame_impl.h"
108 #include "content/renderer/render_process.h" 109 #include "content/renderer/render_process.h"
109 #include "content/renderer/render_thread_impl.h" 110 #include "content/renderer/render_thread_impl.h"
110 #include "content/renderer/render_view_impl_params.h" 111 #include "content/renderer/render_view_impl_params.h"
111 #include "content/renderer/render_view_mouse_lock_dispatcher.h" 112 #include "content/renderer/render_view_mouse_lock_dispatcher.h"
112 #include "content/renderer/render_widget_fullscreen_pepper.h" 113 #include "content/renderer/render_widget_fullscreen_pepper.h"
113 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 114 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
114 #include "content/renderer/renderer_webcolorchooser_impl.h" 115 #include "content/renderer/renderer_webcolorchooser_impl.h"
115 #include "content/renderer/resizing_mode_selector.h" 116 #include "content/renderer/resizing_mode_selector.h"
116 #include "content/renderer/savable_resources.h" 117 #include "content/renderer/savable_resources.h"
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 selection_text_offset_(0), 677 selection_text_offset_(0),
677 selection_range_(gfx::Range::InvalidRange()), 678 selection_range_(gfx::Range::InvalidRange()),
678 #if defined(OS_ANDROID) 679 #if defined(OS_ANDROID)
679 top_controls_constraints_(cc::BOTH), 680 top_controls_constraints_(cc::BOTH),
680 #endif 681 #endif
681 cached_is_main_frame_pinned_to_left_(false), 682 cached_is_main_frame_pinned_to_left_(false),
682 cached_is_main_frame_pinned_to_right_(false), 683 cached_is_main_frame_pinned_to_right_(false),
683 cached_has_main_frame_horizontal_scrollbar_(false), 684 cached_has_main_frame_horizontal_scrollbar_(false),
684 cached_has_main_frame_vertical_scrollbar_(false), 685 cached_has_main_frame_vertical_scrollbar_(false),
685 notification_provider_(NULL), 686 notification_provider_(NULL),
687 push_messaging_dispatcher_(NULL),
686 geolocation_dispatcher_(NULL), 688 geolocation_dispatcher_(NULL),
687 input_tag_speech_dispatcher_(NULL), 689 input_tag_speech_dispatcher_(NULL),
688 speech_recognition_dispatcher_(NULL), 690 speech_recognition_dispatcher_(NULL),
689 media_stream_dispatcher_(NULL), 691 media_stream_dispatcher_(NULL),
690 browser_plugin_manager_(NULL), 692 browser_plugin_manager_(NULL),
691 media_stream_client_(NULL), 693 media_stream_client_(NULL),
692 web_user_media_client_(NULL), 694 web_user_media_client_(NULL),
693 midi_dispatcher_(NULL), 695 midi_dispatcher_(NULL),
694 devtools_agent_(NULL), 696 devtools_agent_(NULL),
695 accessibility_mode_(AccessibilityModeOff), 697 accessibility_mode_(AccessibilityModeOff),
(...skipping 4134 matching lines...) Expand 10 before | Expand all | Expand 10 after
4830 4832
4831 return web_user_media_client_; 4833 return web_user_media_client_;
4832 } 4834 }
4833 4835
4834 blink::WebMIDIClient* RenderViewImpl::webMIDIClient() { 4836 blink::WebMIDIClient* RenderViewImpl::webMIDIClient() {
4835 if (!midi_dispatcher_) 4837 if (!midi_dispatcher_)
4836 midi_dispatcher_ = new MidiDispatcher(this); 4838 midi_dispatcher_ = new MidiDispatcher(this);
4837 return midi_dispatcher_; 4839 return midi_dispatcher_;
4838 } 4840 }
4839 4841
4842 blink::WebPushClient* RenderViewImpl::webPushClient() {
4843 if (!push_messaging_dispatcher_)
4844 push_messaging_dispatcher_ = new PushMessagingDispatcher(this);
4845 return push_messaging_dispatcher_;
4846 }
4847
4840 void RenderViewImpl::draggableRegionsChanged() { 4848 void RenderViewImpl::draggableRegionsChanged() {
4841 FOR_EACH_OBSERVER( 4849 FOR_EACH_OBSERVER(
4842 RenderViewObserver, 4850 RenderViewObserver,
4843 observers_, 4851 observers_,
4844 DraggableRegionsChanged(webview()->mainFrame())); 4852 DraggableRegionsChanged(webview()->mainFrame()));
4845 } 4853 }
4846 4854
4847 WebMediaPlayer* RenderViewImpl::CreateWebMediaPlayerForMediaStream( 4855 WebMediaPlayer* RenderViewImpl::CreateWebMediaPlayerForMediaStream(
4848 WebFrame* frame, 4856 WebFrame* frame,
4849 const blink::WebURL& url, 4857 const blink::WebURL& url,
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
5189 for (size_t i = 0; i < icon_urls.size(); i++) { 5197 for (size_t i = 0; i < icon_urls.size(); i++) {
5190 WebURL url = icon_urls[i].iconURL(); 5198 WebURL url = icon_urls[i].iconURL();
5191 if (!url.isEmpty()) 5199 if (!url.isEmpty())
5192 urls.push_back(FaviconURL(url, 5200 urls.push_back(FaviconURL(url,
5193 ToFaviconType(icon_urls[i].iconType()))); 5201 ToFaviconType(icon_urls[i].iconType())));
5194 } 5202 }
5195 SendUpdateFaviconURL(urls); 5203 SendUpdateFaviconURL(urls);
5196 } 5204 }
5197 5205
5198 } // namespace content 5206 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | ipc/ipc_message_start.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698