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

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

Issue 2258353002: Reland of Remove content::NotificationPermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permissions_typemaps
Patch Set: Close permission service pipe on connection failure. Created 4 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
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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 #include "content/renderer/media/media_stream_dispatcher.h" 105 #include "content/renderer/media/media_stream_dispatcher.h"
106 #include "content/renderer/media/media_stream_renderer_factory_impl.h" 106 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
107 #include "content/renderer/media/render_media_log.h" 107 #include "content/renderer/media/render_media_log.h"
108 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" 108 #include "content/renderer/media/renderer_webmediaplayer_delegate.h"
109 #include "content/renderer/media/user_media_client_impl.h" 109 #include "content/renderer/media/user_media_client_impl.h"
110 #include "content/renderer/media/web_media_element_source_utils.h" 110 #include "content/renderer/media/web_media_element_source_utils.h"
111 #include "content/renderer/media/webmediaplayer_ms.h" 111 #include "content/renderer/media/webmediaplayer_ms.h"
112 #include "content/renderer/mojo/interface_provider_js_wrapper.h" 112 #include "content/renderer/mojo/interface_provider_js_wrapper.h"
113 #include "content/renderer/mojo_bindings_controller.h" 113 #include "content/renderer/mojo_bindings_controller.h"
114 #include "content/renderer/navigation_state_impl.h" 114 #include "content/renderer/navigation_state_impl.h"
115 #include "content/renderer/notification_permission_dispatcher.h"
116 #include "content/renderer/pepper/pepper_audio_controller.h" 115 #include "content/renderer/pepper/pepper_audio_controller.h"
117 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 116 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
118 #include "content/renderer/presentation/presentation_dispatcher.h" 117 #include "content/renderer/presentation/presentation_dispatcher.h"
119 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" 118 #include "content/renderer/push_messaging/push_messaging_dispatcher.h"
120 #include "content/renderer/render_frame_proxy.h" 119 #include "content/renderer/render_frame_proxy.h"
121 #include "content/renderer/render_process.h" 120 #include "content/renderer/render_process.h"
122 #include "content/renderer/render_thread_impl.h" 121 #include "content/renderer/render_thread_impl.h"
123 #include "content/renderer/render_view_impl.h" 122 #include "content/renderer/render_view_impl.h"
124 #include "content/renderer/render_widget_fullscreen_pepper.h" 123 #include "content/renderer/render_widget_fullscreen_pepper.h"
125 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 124 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
(...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 routing_id_(params.routing_id), 1044 routing_id_(params.routing_id),
1046 proxy_routing_id_(MSG_ROUTING_NONE), 1045 proxy_routing_id_(MSG_ROUTING_NONE),
1047 #if defined(ENABLE_PLUGINS) 1046 #if defined(ENABLE_PLUGINS)
1048 plugin_power_saver_helper_(nullptr), 1047 plugin_power_saver_helper_(nullptr),
1049 plugin_find_handler_(nullptr), 1048 plugin_find_handler_(nullptr),
1050 #endif 1049 #endif
1051 cookie_jar_(this), 1050 cookie_jar_(this),
1052 selection_text_offset_(0), 1051 selection_text_offset_(0),
1053 selection_range_(gfx::Range::InvalidRange()), 1052 selection_range_(gfx::Range::InvalidRange()),
1054 handling_select_range_(false), 1053 handling_select_range_(false),
1055 notification_permission_dispatcher_(NULL),
1056 web_user_media_client_(NULL), 1054 web_user_media_client_(NULL),
1057 #if defined(OS_ANDROID) 1055 #if defined(OS_ANDROID)
1058 media_player_manager_(NULL), 1056 media_player_manager_(NULL),
1059 media_session_manager_(NULL), 1057 media_session_manager_(NULL),
1060 #endif 1058 #endif
1061 media_surface_manager_(nullptr), 1059 media_surface_manager_(nullptr),
1062 #if defined(ENABLE_BROWSER_CDMS) 1060 #if defined(ENABLE_BROWSER_CDMS)
1063 cdm_manager_(NULL), 1061 cdm_manager_(NULL),
1064 #endif 1062 #endif
1065 #if defined(VIDEO_HOLE) 1063 #if defined(VIDEO_HOLE)
(...skipping 2681 matching lines...) Expand 10 before | Expand all | Expand 10 after
3747 3745
3748 void RenderFrameImpl::dispatchLoad() { 3746 void RenderFrameImpl::dispatchLoad() {
3749 Send(new FrameHostMsg_DispatchLoad(routing_id_)); 3747 Send(new FrameHostMsg_DispatchLoad(routing_id_));
3750 } 3748 }
3751 3749
3752 blink::WebEffectiveConnectionType 3750 blink::WebEffectiveConnectionType
3753 RenderFrameImpl::getEffectiveConnectionType() { 3751 RenderFrameImpl::getEffectiveConnectionType() {
3754 return effective_connection_type_; 3752 return effective_connection_type_;
3755 } 3753 }
3756 3754
3757 void RenderFrameImpl::requestNotificationPermission(
3758 const blink::WebSecurityOrigin& origin,
3759 blink::WebNotificationPermissionCallback* callback) {
3760 if (!notification_permission_dispatcher_) {
3761 notification_permission_dispatcher_ =
3762 new NotificationPermissionDispatcher(this);
3763 }
3764
3765 notification_permission_dispatcher_->RequestPermission(origin, callback);
3766 }
3767
3768 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) { 3755 void RenderFrameImpl::didChangeSelection(bool is_empty_selection) {
3769 if (!GetRenderWidget()->input_handler().handling_input_event() && 3756 if (!GetRenderWidget()->input_handler().handling_input_event() &&
3770 !handling_select_range_) 3757 !handling_select_range_)
3771 return; 3758 return;
3772 3759
3773 if (is_empty_selection) 3760 if (is_empty_selection)
3774 selection_text_.clear(); 3761 selection_text_.clear();
3775 3762
3776 // UpdateTextInputState should be called before SyncSelectionIfRequired. 3763 // UpdateTextInputState should be called before SyncSelectionIfRequired.
3777 // UpdateTextInputState may send TextInputStateChanged to notify the focus 3764 // UpdateTextInputState may send TextInputStateChanged to notify the focus
(...skipping 2572 matching lines...) Expand 10 before | Expand all | Expand 10 after
6350 // event target. Potentially a Pepper plugin will receive the event. 6337 // event target. Potentially a Pepper plugin will receive the event.
6351 // In order to tell whether a plugin gets the last mouse event and which it 6338 // In order to tell whether a plugin gets the last mouse event and which it
6352 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6339 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6353 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6340 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6354 // |pepper_last_mouse_event_target_|. 6341 // |pepper_last_mouse_event_target_|.
6355 pepper_last_mouse_event_target_ = nullptr; 6342 pepper_last_mouse_event_target_ = nullptr;
6356 #endif 6343 #endif
6357 } 6344 }
6358 6345
6359 } // namespace content 6346 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698