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

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

Issue 100943002: Convert PepperBrowserConnection to be a RenderFrameObserver. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years 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 (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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 #include "ui/native_theme/native_theme_win.h" 237 #include "ui/native_theme/native_theme_win.h"
238 #elif defined(USE_X11) 238 #elif defined(USE_X11)
239 #include "ui/native_theme/native_theme.h" 239 #include "ui/native_theme/native_theme.h"
240 #elif defined(OS_MACOSX) 240 #elif defined(OS_MACOSX)
241 #include "skia/ext/skia_utils_mac.h" 241 #include "skia/ext/skia_utils_mac.h"
242 #endif 242 #endif
243 243
244 #if defined(ENABLE_PLUGINS) 244 #if defined(ENABLE_PLUGINS)
245 #include "content/renderer/npapi/webplugin_delegate_proxy.h" 245 #include "content/renderer/npapi/webplugin_delegate_proxy.h"
246 #include "content/renderer/npapi/webplugin_impl.h" 246 #include "content/renderer/npapi/webplugin_impl.h"
247 #include "content/renderer/pepper/pepper_browser_connection.h"
248 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 247 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
249 #include "content/renderer/pepper/pepper_plugin_registry.h" 248 #include "content/renderer/pepper/pepper_plugin_registry.h"
250 #include "content/renderer/pepper/pepper_webplugin_impl.h" 249 #include "content/renderer/pepper/pepper_webplugin_impl.h"
251 #include "content/renderer/pepper/plugin_module.h" 250 #include "content/renderer/pepper/plugin_module.h"
252 #endif 251 #endif
253 252
254 #if defined(ENABLE_WEBRTC) 253 #if defined(ENABLE_WEBRTC)
255 #include "content/renderer/media/rtc_peer_connection_handler.h" 254 #include "content/renderer/media/rtc_peer_connection_handler.h"
256 #endif 255 #endif
257 256
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 998
1000 new IdleUserDetector(this); 999 new IdleUserDetector(this);
1001 1000
1002 if (command_line.HasSwitch(switches::kDomAutomationController)) 1001 if (command_line.HasSwitch(switches::kDomAutomationController))
1003 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION; 1002 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION;
1004 if (command_line.HasSwitch(switches::kStatsCollectionController)) 1003 if (command_line.HasSwitch(switches::kStatsCollectionController))
1005 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION; 1004 enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION;
1006 1005
1007 ProcessViewLayoutFlags(command_line); 1006 ProcessViewLayoutFlags(command_line);
1008 1007
1009 #if defined(ENABLE_PLUGINS)
1010 new PepperBrowserConnection(this);
1011 #endif
1012
1013 GetContentClient()->renderer()->RenderViewCreated(this); 1008 GetContentClient()->renderer()->RenderViewCreated(this);
1014 1009
1015 // If we have an opener_id but we weren't created by a renderer, then 1010 // If we have an opener_id but we weren't created by a renderer, then
1016 // it's the browser asking us to set our opener to another RenderView. 1011 // it's the browser asking us to set our opener to another RenderView.
1017 if (params->opener_id != MSG_ROUTING_NONE && !params->is_renderer_created) { 1012 if (params->opener_id != MSG_ROUTING_NONE && !params->is_renderer_created) {
1018 RenderViewImpl* opener_view = FromRoutingID(params->opener_id); 1013 RenderViewImpl* opener_view = FromRoutingID(params->opener_id);
1019 if (opener_view) 1014 if (opener_view)
1020 webview()->mainFrame()->setOpener(opener_view->webview()->mainFrame()); 1015 webview()->mainFrame()->setOpener(opener_view->webview()->mainFrame());
1021 } 1016 }
1022 1017
(...skipping 5429 matching lines...) Expand 10 before | Expand all | Expand 10 after
6452 for (size_t i = 0; i < icon_urls.size(); i++) { 6447 for (size_t i = 0; i < icon_urls.size(); i++) {
6453 WebURL url = icon_urls[i].iconURL(); 6448 WebURL url = icon_urls[i].iconURL();
6454 if (!url.isEmpty()) 6449 if (!url.isEmpty())
6455 urls.push_back(FaviconURL(url, 6450 urls.push_back(FaviconURL(url,
6456 ToFaviconType(icon_urls[i].iconType()))); 6451 ToFaviconType(icon_urls[i].iconType())));
6457 } 6452 }
6458 SendUpdateFaviconURL(urls); 6453 SendUpdateFaviconURL(urls);
6459 } 6454 }
6460 6455
6461 } // namespace content 6456 } // namespace content
OLDNEW
« content/renderer/pepper/renderer_ppapi_host_impl.cc ('K') | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698