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

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

Issue 20987009: Rename PepperPluginDelegateImpl to PepperHelperImpl after getting rid of the PluginDelegate interfa… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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_view_impl.h ('k') | content/renderer/render_view_pepper_helper.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 #include "content/renderer/media/media_stream_impl.h" 100 #include "content/renderer/media/media_stream_impl.h"
101 #include "content/renderer/media/midi_dispatcher.h" 101 #include "content/renderer/media/midi_dispatcher.h"
102 #include "content/renderer/media/render_media_log.h" 102 #include "content/renderer/media/render_media_log.h"
103 #include "content/renderer/media/rtc_peer_connection_handler.h" 103 #include "content/renderer/media/rtc_peer_connection_handler.h"
104 #include "content/renderer/media/video_capture_impl_manager.h" 104 #include "content/renderer/media/video_capture_impl_manager.h"
105 #include "content/renderer/media/webmediaplayer_impl.h" 105 #include "content/renderer/media/webmediaplayer_impl.h"
106 #include "content/renderer/media/webmediaplayer_ms.h" 106 #include "content/renderer/media/webmediaplayer_ms.h"
107 #include "content/renderer/media/webmediaplayer_params.h" 107 #include "content/renderer/media/webmediaplayer_params.h"
108 #include "content/renderer/mhtml_generator.h" 108 #include "content/renderer/mhtml_generator.h"
109 #include "content/renderer/notification_provider.h" 109 #include "content/renderer/notification_provider.h"
110 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h" 110 #include "content/renderer/pepper/pepper_helper_impl.h"
111 #include "content/renderer/pepper/pepper_plugin_registry.h" 111 #include "content/renderer/pepper/pepper_plugin_registry.h"
112 #include "content/renderer/render_frame_impl.h" 112 #include "content/renderer/render_frame_impl.h"
113 #include "content/renderer/render_process.h" 113 #include "content/renderer/render_process.h"
114 #include "content/renderer/render_thread_impl.h" 114 #include "content/renderer/render_thread_impl.h"
115 #include "content/renderer/render_view_impl_params.h" 115 #include "content/renderer/render_view_impl_params.h"
116 #include "content/renderer/render_view_mouse_lock_dispatcher.h" 116 #include "content/renderer/render_view_mouse_lock_dispatcher.h"
117 #include "content/renderer/render_widget_fullscreen_pepper.h" 117 #include "content/renderer/render_widget_fullscreen_pepper.h"
118 #include "content/renderer/renderer_date_time_picker.h" 118 #include "content/renderer/renderer_date_time_picker.h"
119 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 119 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
120 #include "content/renderer/renderer_webcolorchooser_impl.h" 120 #include "content/renderer/renderer_webcolorchooser_impl.h"
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 new IdleUserDetector(this); 954 new IdleUserDetector(this);
955 955
956 if (command_line.HasSwitch(switches::kDomAutomationController)) 956 if (command_line.HasSwitch(switches::kDomAutomationController))
957 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION; 957 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION;
958 if (command_line.HasSwitch(switches::kStatsCollectionController)) 958 if (command_line.HasSwitch(switches::kStatsCollectionController))
959 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION; 959 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION;
960 960
961 ProcessViewLayoutFlags(command_line); 961 ProcessViewLayoutFlags(command_line);
962 962
963 #if defined(ENABLE_PLUGINS) 963 #if defined(ENABLE_PLUGINS)
964 pepper_helper_.reset(new PepperPluginDelegateImpl(this)); 964 pepper_helper_.reset(new PepperHelperImpl(this));
965 #else 965 #else
966 pepper_helper_.reset(new RenderViewPepperHelper()); 966 pepper_helper_.reset(new PepperHelper());
967 #endif 967 #endif
968 968
969 GetContentClient()->renderer()->RenderViewCreated(this); 969 GetContentClient()->renderer()->RenderViewCreated(this);
970 970
971 // If we have an opener_id but we weren't created by a renderer, then 971 // If we have an opener_id but we weren't created by a renderer, then
972 // it's the browser asking us to set our opener to another RenderView. 972 // it's the browser asking us to set our opener to another RenderView.
973 if (params->opener_id != MSG_ROUTING_NONE && !params->is_renderer_created) { 973 if (params->opener_id != MSG_ROUTING_NONE && !params->is_renderer_created) {
974 RenderViewImpl* opener_view = FromRoutingID(params->opener_id); 974 RenderViewImpl* opener_view = FromRoutingID(params->opener_id);
975 if (opener_view) 975 if (opener_view)
976 webview()->mainFrame()->setOpener(opener_view->webview()->mainFrame()); 976 webview()->mainFrame()->setOpener(opener_view->webview()->mainFrame());
(...skipping 5399 matching lines...) Expand 10 before | Expand all | Expand 10 after
6376 WebURL url = icon_urls[i].iconURL(); 6376 WebURL url = icon_urls[i].iconURL();
6377 if (!url.isEmpty()) 6377 if (!url.isEmpty())
6378 urls.push_back(FaviconURL(url, 6378 urls.push_back(FaviconURL(url,
6379 ToFaviconType(icon_urls[i].iconType()))); 6379 ToFaviconType(icon_urls[i].iconType())));
6380 } 6380 }
6381 SendUpdateFaviconURL(urls); 6381 SendUpdateFaviconURL(urls);
6382 } 6382 }
6383 6383
6384 6384
6385 } // namespace content 6385 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_view_pepper_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698