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

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

Issue 2643063002: Refactor Blink's ServiceConnector and add ability to mock in layout tests (Closed)
Patch Set: fix compile Created 3 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
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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 #include "content/renderer/media/audio_device_factory.h" 114 #include "content/renderer/media/audio_device_factory.h"
115 #include "content/renderer/media/media_devices_listener_impl.h" 115 #include "content/renderer/media/media_devices_listener_impl.h"
116 #include "content/renderer/media/media_permission_dispatcher.h" 116 #include "content/renderer/media/media_permission_dispatcher.h"
117 #include "content/renderer/media/media_stream_dispatcher.h" 117 #include "content/renderer/media/media_stream_dispatcher.h"
118 #include "content/renderer/media/media_stream_renderer_factory_impl.h" 118 #include "content/renderer/media/media_stream_renderer_factory_impl.h"
119 #include "content/renderer/media/render_media_log.h" 119 #include "content/renderer/media/render_media_log.h"
120 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" 120 #include "content/renderer/media/renderer_webmediaplayer_delegate.h"
121 #include "content/renderer/media/user_media_client_impl.h" 121 #include "content/renderer/media/user_media_client_impl.h"
122 #include "content/renderer/media/web_media_element_source_utils.h" 122 #include "content/renderer/media/web_media_element_source_utils.h"
123 #include "content/renderer/media/webmediaplayer_ms.h" 123 #include "content/renderer/media/webmediaplayer_ms.h"
124 #include "content/renderer/mojo/blink_connector_impl.h"
125 #include "content/renderer/mojo/blink_connector_js_wrapper.h"
124 #include "content/renderer/mojo/blink_interface_registry_impl.h" 126 #include "content/renderer/mojo/blink_interface_registry_impl.h"
125 #include "content/renderer/mojo/interface_provider_js_wrapper.h" 127 #include "content/renderer/mojo/interface_provider_js_wrapper.h"
126 #include "content/renderer/mojo_bindings_controller.h" 128 #include "content/renderer/mojo_bindings_controller.h"
127 #include "content/renderer/navigation_state_impl.h" 129 #include "content/renderer/navigation_state_impl.h"
128 #include "content/renderer/pepper/pepper_audio_controller.h" 130 #include "content/renderer/pepper/pepper_audio_controller.h"
129 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 131 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
130 #include "content/renderer/presentation/presentation_dispatcher.h" 132 #include "content/renderer/presentation/presentation_dispatcher.h"
131 #include "content/renderer/push_messaging/push_messaging_client.h" 133 #include "content/renderer/push_messaging/push_messaging_client.h"
132 #include "content/renderer/render_frame_proxy.h" 134 #include "content/renderer/render_frame_proxy.h"
133 #include "content/renderer/render_process.h" 135 #include "content/renderer/render_process.h"
134 #include "content/renderer/render_thread_impl.h" 136 #include "content/renderer/render_thread_impl.h"
135 #include "content/renderer/render_view_impl.h" 137 #include "content/renderer/render_view_impl.h"
136 #include "content/renderer/render_widget_fullscreen_pepper.h" 138 #include "content/renderer/render_widget_fullscreen_pepper.h"
139 #include "content/renderer/renderer_blink_platform_impl.h"
137 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 140 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
138 #include "content/renderer/renderer_webcolorchooser_impl.h" 141 #include "content/renderer/renderer_webcolorchooser_impl.h"
139 #include "content/renderer/savable_resources.h" 142 #include "content/renderer/savable_resources.h"
140 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 143 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
141 #include "content/renderer/shared_worker/shared_worker_repository.h" 144 #include "content/renderer/shared_worker/shared_worker_repository.h"
142 #include "content/renderer/shared_worker/websharedworker_proxy.h" 145 #include "content/renderer/shared_worker/websharedworker_proxy.h"
143 #include "content/renderer/skia_benchmarking_extension.h" 146 #include "content/renderer/skia_benchmarking_extension.h"
144 #include "content/renderer/stats_collection_controller.h" 147 #include "content/renderer/stats_collection_controller.h"
145 #include "content/renderer/web_frame_utils.h" 148 #include "content/renderer/web_frame_utils.h"
146 #include "content/renderer/web_ui_extension.h" 149 #include "content/renderer/web_ui_extension.h"
(...skipping 2495 matching lines...) Expand 10 before | Expand all | Expand 10 after
2642 registry->AddBuiltinModule( 2645 registry->AddBuiltinModule(
2643 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName, 2646 isolate, InterfaceProviderJsWrapper::kPerFrameModuleName,
2644 InterfaceProviderJsWrapper::Create( 2647 InterfaceProviderJsWrapper::Create(
2645 isolate, context, remote_interfaces_.get()) 2648 isolate, context, remote_interfaces_.get())
2646 .ToV8()); 2649 .ToV8());
2647 registry->AddBuiltinModule( 2650 registry->AddBuiltinModule(
2648 isolate, InterfaceProviderJsWrapper::kPerProcessModuleName, 2651 isolate, InterfaceProviderJsWrapper::kPerProcessModuleName,
2649 InterfaceProviderJsWrapper::Create( 2652 InterfaceProviderJsWrapper::Create(
2650 isolate, context, RenderThread::Get()->GetRemoteInterfaces()) 2653 isolate, context, RenderThread::Get()->GetRemoteInterfaces())
2651 .ToV8()); 2654 .ToV8());
2655 registry->AddBuiltinModule(
2656 isolate, BlinkConnectorJsWrapper::kModuleName,
2657 BlinkConnectorJsWrapper::Create(
2658 isolate, context,
2659 static_cast<BlinkConnectorImpl*>(
2660 RenderThreadImpl::current()->blink_platform_impl()->connector()))
2661 .ToV8());
2652 } 2662 }
2653 2663
2654 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level, 2664 void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level,
2655 const std::string& message) { 2665 const std::string& message) {
2656 blink::WebConsoleMessage::Level target_level = 2666 blink::WebConsoleMessage::Level target_level =
2657 blink::WebConsoleMessage::LevelInfo; 2667 blink::WebConsoleMessage::LevelInfo;
2658 switch (level) { 2668 switch (level) {
2659 case CONSOLE_MESSAGE_LEVEL_VERBOSE: 2669 case CONSOLE_MESSAGE_LEVEL_VERBOSE:
2660 target_level = blink::WebConsoleMessage::LevelVerbose; 2670 target_level = blink::WebConsoleMessage::LevelVerbose;
2661 break; 2671 break;
(...skipping 4270 matching lines...) Expand 10 before | Expand all | Expand 10 after
6932 policy(info.defaultPolicy), 6942 policy(info.defaultPolicy),
6933 replaces_current_history_item(info.replacesCurrentHistoryItem), 6943 replaces_current_history_item(info.replacesCurrentHistoryItem),
6934 history_navigation_in_new_child_frame( 6944 history_navigation_in_new_child_frame(
6935 info.isHistoryNavigationInNewChildFrame), 6945 info.isHistoryNavigationInNewChildFrame),
6936 client_redirect(info.isClientRedirect), 6946 client_redirect(info.isClientRedirect),
6937 cache_disabled(info.isCacheDisabled), 6947 cache_disabled(info.isCacheDisabled),
6938 form(info.form), 6948 form(info.form),
6939 source_location(info.sourceLocation) {} 6949 source_location(info.sourceLocation) {}
6940 6950
6941 } // namespace content 6951 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698