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

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

Issue 381633005: Refactor Web Notification permission requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_frame_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #include "content/renderer/media/audio_renderer_mixer_manager.h" 66 #include "content/renderer/media/audio_renderer_mixer_manager.h"
67 #include "content/renderer/media/media_stream_dispatcher.h" 67 #include "content/renderer/media/media_stream_dispatcher.h"
68 #include "content/renderer/media/media_stream_impl.h" 68 #include "content/renderer/media/media_stream_impl.h"
69 #include "content/renderer/media/media_stream_renderer_factory.h" 69 #include "content/renderer/media/media_stream_renderer_factory.h"
70 #include "content/renderer/media/midi_dispatcher.h" 70 #include "content/renderer/media/midi_dispatcher.h"
71 #include "content/renderer/media/render_media_log.h" 71 #include "content/renderer/media/render_media_log.h"
72 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" 72 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
73 #include "content/renderer/media/webmediaplayer_impl.h" 73 #include "content/renderer/media/webmediaplayer_impl.h"
74 #include "content/renderer/media/webmediaplayer_ms.h" 74 #include "content/renderer/media/webmediaplayer_ms.h"
75 #include "content/renderer/media/webmediaplayer_params.h" 75 #include "content/renderer/media/webmediaplayer_params.h"
76 #include "content/renderer/notification_permission_dispatcher.h"
76 #include "content/renderer/notification_provider.h" 77 #include "content/renderer/notification_provider.h"
77 #include "content/renderer/npapi/plugin_channel_host.h" 78 #include "content/renderer/npapi/plugin_channel_host.h"
78 #include "content/renderer/push_messaging_dispatcher.h" 79 #include "content/renderer/push_messaging_dispatcher.h"
79 #include "content/renderer/render_process.h" 80 #include "content/renderer/render_process.h"
80 #include "content/renderer/render_thread_impl.h" 81 #include "content/renderer/render_thread_impl.h"
81 #include "content/renderer/render_view_impl.h" 82 #include "content/renderer/render_view_impl.h"
82 #include "content/renderer/render_widget_fullscreen_pepper.h" 83 #include "content/renderer/render_widget_fullscreen_pepper.h"
83 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 84 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
84 #include "content/renderer/renderer_webcolorchooser_impl.h" 85 #include "content/renderer/renderer_webcolorchooser_impl.h"
85 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 86 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 : frame_(NULL), 398 : frame_(NULL),
398 render_view_(render_view->AsWeakPtr()), 399 render_view_(render_view->AsWeakPtr()),
399 routing_id_(routing_id), 400 routing_id_(routing_id),
400 is_swapped_out_(false), 401 is_swapped_out_(false),
401 render_frame_proxy_(NULL), 402 render_frame_proxy_(NULL),
402 is_detaching_(false), 403 is_detaching_(false),
403 cookie_jar_(this), 404 cookie_jar_(this),
404 selection_text_offset_(0), 405 selection_text_offset_(0),
405 selection_range_(gfx::Range::InvalidRange()), 406 selection_range_(gfx::Range::InvalidRange()),
406 handling_select_range_(false), 407 handling_select_range_(false),
408 notification_permission_dispatcher_(NULL),
407 notification_provider_(NULL), 409 notification_provider_(NULL),
408 web_user_media_client_(NULL), 410 web_user_media_client_(NULL),
409 midi_dispatcher_(NULL), 411 midi_dispatcher_(NULL),
410 #if defined(OS_ANDROID) 412 #if defined(OS_ANDROID)
411 media_player_manager_(NULL), 413 media_player_manager_(NULL),
412 #endif 414 #endif
413 #if defined(ENABLE_BROWSER_CDMS) 415 #if defined(ENABLE_BROWSER_CDMS)
414 cdm_manager_(NULL), 416 cdm_manager_(NULL),
415 #endif 417 #endif
416 #if defined(VIDEO_HOLE) 418 #if defined(VIDEO_HOLE)
(...skipping 1819 matching lines...) Expand 10 before | Expand all | Expand 10 after
2236 } 2238 }
2237 2239
2238 void RenderFrameImpl::didChangeThemeColor() { 2240 void RenderFrameImpl::didChangeThemeColor() {
2239 if (frame_->parent()) 2241 if (frame_->parent())
2240 return; 2242 return;
2241 2243
2242 Send(new FrameHostMsg_DidChangeThemeColor( 2244 Send(new FrameHostMsg_DidChangeThemeColor(
2243 routing_id_, frame_->document().themeColor())); 2245 routing_id_, frame_->document().themeColor()));
2244 } 2246 }
2245 2247
2248 void RenderFrameImpl::requestNotificationPermission(
2249 const blink::WebSecurityOrigin& origin,
2250 blink::WebNotificationPermissionCallback* callback) {
2251 if (!notification_permission_dispatcher_) {
2252 notification_permission_dispatcher_ =
2253 new NotificationPermissionDispatcher(this);
2254 }
2255
2256 notification_permission_dispatcher_->RequestPermission(origin, callback);
2257 }
2258
2246 blink::WebNotificationPresenter* RenderFrameImpl::notificationPresenter() { 2259 blink::WebNotificationPresenter* RenderFrameImpl::notificationPresenter() {
2247 return notification_provider_; 2260 return notification_provider_;
2248 } 2261 }
2249 2262
2250 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) { 2263 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) {
2251 if (!GetRenderWidget()->handling_input_event() && !handling_select_range_) 2264 if (!GetRenderWidget()->handling_input_event() && !handling_select_range_)
2252 return; 2265 return;
2253 2266
2254 if (is_empty_selection) 2267 if (is_empty_selection)
2255 selection_text_.clear(); 2268 selection_text_.clear();
(...skipping 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after
3632 3645
3633 #if defined(ENABLE_BROWSER_CDMS) 3646 #if defined(ENABLE_BROWSER_CDMS)
3634 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3647 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3635 if (!cdm_manager_) 3648 if (!cdm_manager_)
3636 cdm_manager_ = new RendererCdmManager(this); 3649 cdm_manager_ = new RendererCdmManager(this);
3637 return cdm_manager_; 3650 return cdm_manager_;
3638 } 3651 }
3639 #endif // defined(ENABLE_BROWSER_CDMS) 3652 #endif // defined(ENABLE_BROWSER_CDMS)
3640 3653
3641 } // namespace content 3654 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | ipc/ipc_message_start.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698