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

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: rebase 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 : frame_(NULL), 390 : frame_(NULL),
390 render_view_(render_view->AsWeakPtr()), 391 render_view_(render_view->AsWeakPtr()),
391 routing_id_(routing_id), 392 routing_id_(routing_id),
392 is_swapped_out_(false), 393 is_swapped_out_(false),
393 render_frame_proxy_(NULL), 394 render_frame_proxy_(NULL),
394 is_detaching_(false), 395 is_detaching_(false),
395 cookie_jar_(this), 396 cookie_jar_(this),
396 selection_text_offset_(0), 397 selection_text_offset_(0),
397 selection_range_(gfx::Range::InvalidRange()), 398 selection_range_(gfx::Range::InvalidRange()),
398 handling_select_range_(false), 399 handling_select_range_(false),
400 notification_permission_dispatcher_(NULL),
399 notification_provider_(NULL), 401 notification_provider_(NULL),
400 web_user_media_client_(NULL), 402 web_user_media_client_(NULL),
401 midi_dispatcher_(NULL), 403 midi_dispatcher_(NULL),
402 #if defined(OS_ANDROID) 404 #if defined(OS_ANDROID)
403 media_player_manager_(NULL), 405 media_player_manager_(NULL),
404 #endif 406 #endif
405 #if defined(ENABLE_BROWSER_CDMS) 407 #if defined(ENABLE_BROWSER_CDMS)
406 cdm_manager_(NULL), 408 cdm_manager_(NULL),
407 #endif 409 #endif
408 #if defined(VIDEO_HOLE) 410 #if defined(VIDEO_HOLE)
(...skipping 1772 matching lines...) Expand 10 before | Expand all | Expand 10 after
2181 } 2183 }
2182 2184
2183 void RenderFrameImpl::didChangeThemeColor() { 2185 void RenderFrameImpl::didChangeThemeColor() {
2184 if (frame_->parent()) 2186 if (frame_->parent())
2185 return; 2187 return;
2186 2188
2187 Send(new FrameHostMsg_DidChangeThemeColor( 2189 Send(new FrameHostMsg_DidChangeThemeColor(
2188 routing_id_, frame_->document().themeColor())); 2190 routing_id_, frame_->document().themeColor()));
2189 } 2191 }
2190 2192
2193 void RenderFrameImpl::requestNotificationPermission(
2194 const blink::WebSecurityOrigin& origin,
2195 blink::WebNotificationPermissionCallback* callback) {
2196 if (!notification_permission_dispatcher_) {
2197 notification_permission_dispatcher_ =
2198 new NotificationPermissionDispatcher(this);
2199 }
2200
2201 notification_permission_dispatcher_->RequestPermission(origin, callback);
2202 }
2203
2191 blink::WebNotificationPresenter* RenderFrameImpl::notificationPresenter() { 2204 blink::WebNotificationPresenter* RenderFrameImpl::notificationPresenter() {
2192 return notification_provider_; 2205 return notification_provider_;
2193 } 2206 }
2194 2207
2195 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) { 2208 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) {
2196 if (!GetRenderWidget()->handling_input_event() && !handling_select_range_) 2209 if (!GetRenderWidget()->handling_input_event() && !handling_select_range_)
2197 return; 2210 return;
2198 2211
2199 if (is_empty_selection) 2212 if (is_empty_selection)
2200 selection_text_.clear(); 2213 selection_text_.clear();
(...skipping 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after
3578 3591
3579 #if defined(ENABLE_BROWSER_CDMS) 3592 #if defined(ENABLE_BROWSER_CDMS)
3580 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3593 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3581 if (!cdm_manager_) 3594 if (!cdm_manager_)
3582 cdm_manager_ = new RendererCdmManager(this); 3595 cdm_manager_ = new RendererCdmManager(this);
3583 return cdm_manager_; 3596 return cdm_manager_;
3584 } 3597 }
3585 #endif // defined(ENABLE_BROWSER_CDMS) 3598 #endif // defined(ENABLE_BROWSER_CDMS)
3586 3599
3587 } // namespace content 3600 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698