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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 10274020: Revert 134620 - Show a replacement plug-in for loading errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
Property Changes:
Added: svn:mergeinfo
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 "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 std::string actual_mime_type; 288 std::string actual_mime_type;
289 render_view->Send(new ChromeViewHostMsg_GetPluginInfo( 289 render_view->Send(new ChromeViewHostMsg_GetPluginInfo(
290 render_view->GetRoutingID(), GURL(params.url), 290 render_view->GetRoutingID(), GURL(params.url),
291 frame->top()->document().url(), params.mimeType.utf8(), 291 frame->top()->document().url(), params.mimeType.utf8(),
292 &status, &plugin_info, &actual_mime_type)); 292 &status, &plugin_info, &actual_mime_type));
293 *plugin = CreatePlugin(render_view, frame, params, 293 *plugin = CreatePlugin(render_view, frame, params,
294 status, plugin_info, actual_mime_type); 294 status, plugin_info, actual_mime_type);
295 return true; 295 return true;
296 } 296 }
297 297
298 WebPlugin* ChromeContentRendererClient::CreatePluginReplacement(
299 content::RenderView* render_view,
300 const FilePath& plugin_path) {
301 PluginPlaceholder* placeholder =
302 PluginPlaceholder::CreateErrorPlugin(render_view, plugin_path);
303 return placeholder->plugin();
304 }
305
306 webkit_media::WebMediaPlayerImpl* 298 webkit_media::WebMediaPlayerImpl*
307 ChromeContentRendererClient::OverrideCreateWebMediaPlayer( 299 ChromeContentRendererClient::OverrideCreateWebMediaPlayer(
308 content::RenderView* render_view, 300 content::RenderView* render_view,
309 WebKit::WebFrame* frame, 301 WebKit::WebFrame* frame,
310 WebKit::WebMediaPlayerClient* client, 302 WebKit::WebMediaPlayerClient* client,
311 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, 303 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
312 media::FilterCollection* collection, 304 media::FilterCollection* collection,
313 WebKit::WebAudioSourceProvider* audio_source_provider, 305 WebKit::WebAudioSourceProvider* audio_source_provider,
314 media::MessageLoopFactory* message_loop_factory, 306 media::MessageLoopFactory* message_loop_factory,
315 webkit_media::MediaStreamClient* media_stream_client, 307 webkit_media::MediaStreamClient* media_stream_client,
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 873 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
882 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 874 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
883 } 875 }
884 876
885 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 877 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
886 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 878 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
887 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 879 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
888 } 880 }
889 881
890 } // namespace chrome 882 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | chrome/renderer/plugins/plugin_placeholder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698