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

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, 5 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
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 #include "content/renderer/media/audio_renderer_mixer_manager.h" 62 #include "content/renderer/media/audio_renderer_mixer_manager.h"
63 #include "content/renderer/media/media_stream_dispatcher.h" 63 #include "content/renderer/media/media_stream_dispatcher.h"
64 #include "content/renderer/media/media_stream_impl.h" 64 #include "content/renderer/media/media_stream_impl.h"
65 #include "content/renderer/media/media_stream_renderer_factory.h" 65 #include "content/renderer/media/media_stream_renderer_factory.h"
66 #include "content/renderer/media/midi_dispatcher.h" 66 #include "content/renderer/media/midi_dispatcher.h"
67 #include "content/renderer/media/render_media_log.h" 67 #include "content/renderer/media/render_media_log.h"
68 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" 68 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
69 #include "content/renderer/media/webmediaplayer_impl.h" 69 #include "content/renderer/media/webmediaplayer_impl.h"
70 #include "content/renderer/media/webmediaplayer_ms.h" 70 #include "content/renderer/media/webmediaplayer_ms.h"
71 #include "content/renderer/media/webmediaplayer_params.h" 71 #include "content/renderer/media/webmediaplayer_params.h"
72 #include "content/renderer/notification_permission_dispatcher.h"
72 #include "content/renderer/notification_provider.h" 73 #include "content/renderer/notification_provider.h"
73 #include "content/renderer/npapi/plugin_channel_host.h" 74 #include "content/renderer/npapi/plugin_channel_host.h"
74 #include "content/renderer/push_messaging_dispatcher.h" 75 #include "content/renderer/push_messaging_dispatcher.h"
75 #include "content/renderer/render_process.h" 76 #include "content/renderer/render_process.h"
76 #include "content/renderer/render_thread_impl.h" 77 #include "content/renderer/render_thread_impl.h"
77 #include "content/renderer/render_view_impl.h" 78 #include "content/renderer/render_view_impl.h"
78 #include "content/renderer/render_widget_fullscreen_pepper.h" 79 #include "content/renderer/render_widget_fullscreen_pepper.h"
79 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 80 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
80 #include "content/renderer/renderer_webcolorchooser_impl.h" 81 #include "content/renderer/renderer_webcolorchooser_impl.h"
81 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 82 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 : frame_(NULL), 391 : frame_(NULL),
391 render_view_(render_view->AsWeakPtr()), 392 render_view_(render_view->AsWeakPtr()),
392 routing_id_(routing_id), 393 routing_id_(routing_id),
393 is_swapped_out_(false), 394 is_swapped_out_(false),
394 render_frame_proxy_(NULL), 395 render_frame_proxy_(NULL),
395 is_detaching_(false), 396 is_detaching_(false),
396 cookie_jar_(this), 397 cookie_jar_(this),
397 selection_text_offset_(0), 398 selection_text_offset_(0),
398 selection_range_(gfx::Range::InvalidRange()), 399 selection_range_(gfx::Range::InvalidRange()),
399 handling_select_range_(false), 400 handling_select_range_(false),
401 notification_permission_dispatcher_(NULL),
400 notification_provider_(NULL), 402 notification_provider_(NULL),
401 web_user_media_client_(NULL), 403 web_user_media_client_(NULL),
402 midi_dispatcher_(NULL), 404 midi_dispatcher_(NULL),
403 #if defined(OS_ANDROID) 405 #if defined(OS_ANDROID)
404 media_player_manager_(NULL), 406 media_player_manager_(NULL),
405 #endif 407 #endif
406 #if defined(ENABLE_BROWSER_CDMS) 408 #if defined(ENABLE_BROWSER_CDMS)
407 cdm_manager_(NULL), 409 cdm_manager_(NULL),
408 #endif 410 #endif
409 geolocation_dispatcher_(NULL), 411 geolocation_dispatcher_(NULL),
(...skipping 1760 matching lines...) Expand 10 before | Expand all | Expand 10 after
2170 } 2172 }
2171 2173
2172 void RenderFrameImpl::didChangeBrandColor() { 2174 void RenderFrameImpl::didChangeBrandColor() {
2173 if (frame_->parent()) 2175 if (frame_->parent())
2174 return; 2176 return;
2175 2177
2176 Send(new FrameHostMsg_DidChangeBrandColor( 2178 Send(new FrameHostMsg_DidChangeBrandColor(
2177 routing_id_, frame_->document().brandColor())); 2179 routing_id_, frame_->document().brandColor()));
2178 } 2180 }
2179 2181
2182 void RenderFrameImpl::requestNotificationPermission(
2183 const blink::WebSecurityOrigin& origin,
2184 blink::WebNotificationPermissionCallback* callback) {
2185 if (!notification_permission_dispatcher_) {
2186 notification_permission_dispatcher_ =
2187 new NotificationPermissionDispatcher(this);
2188 }
2189
2190 notification_permission_dispatcher_->RequestPermission(origin, callback);
2191 }
2192
2180 blink::WebNotificationPresenter* RenderFrameImpl::notificationPresenter() { 2193 blink::WebNotificationPresenter* RenderFrameImpl::notificationPresenter() {
2181 return notification_provider_; 2194 return notification_provider_;
2182 } 2195 }
2183 2196
2184 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) { 2197 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) {
2185 if (!GetRenderWidget()->handling_input_event() && !handling_select_range_) 2198 if (!GetRenderWidget()->handling_input_event() && !handling_select_range_)
2186 return; 2199 return;
2187 2200
2188 if (is_empty_selection) 2201 if (is_empty_selection)
2189 selection_text_.clear(); 2202 selection_text_.clear();
(...skipping 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
3571 3584
3572 #if defined(ENABLE_BROWSER_CDMS) 3585 #if defined(ENABLE_BROWSER_CDMS)
3573 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3586 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3574 if (!cdm_manager_) 3587 if (!cdm_manager_)
3575 cdm_manager_ = new RendererCdmManager(this); 3588 cdm_manager_ = new RendererCdmManager(this);
3576 return cdm_manager_; 3589 return cdm_manager_;
3577 } 3590 }
3578 #endif // defined(ENABLE_BROWSER_CDMS) 3591 #endif // defined(ENABLE_BROWSER_CDMS)
3579 3592
3580 } // namespace content 3593 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698