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

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

Issue 18587003: Rename PrerenderWebMediaPlayer to PrerenderMediaLoadDeferrer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 5 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 | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/prerender/prerender_media_load_deferrer.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 "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "chrome/renderer/net_benchmarking_extension.h" 48 #include "chrome/renderer/net_benchmarking_extension.h"
49 #include "chrome/renderer/one_click_signin_agent.h" 49 #include "chrome/renderer/one_click_signin_agent.h"
50 #include "chrome/renderer/page_load_histograms.h" 50 #include "chrome/renderer/page_load_histograms.h"
51 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h" 51 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h"
52 #include "chrome/renderer/pepper/pepper_helper.h" 52 #include "chrome/renderer/pepper/pepper_helper.h"
53 #include "chrome/renderer/playback_extension.h" 53 #include "chrome/renderer/playback_extension.h"
54 #include "chrome/renderer/plugins/plugin_placeholder.h" 54 #include "chrome/renderer/plugins/plugin_placeholder.h"
55 #include "chrome/renderer/plugins/plugin_uma.h" 55 #include "chrome/renderer/plugins/plugin_uma.h"
56 #include "chrome/renderer/prerender/prerender_dispatcher.h" 56 #include "chrome/renderer/prerender/prerender_dispatcher.h"
57 #include "chrome/renderer/prerender/prerender_helper.h" 57 #include "chrome/renderer/prerender/prerender_helper.h"
58 #include "chrome/renderer/prerender/prerender_webmediaplayer.h" 58 #include "chrome/renderer/prerender/prerender_media_load_deferrer.h"
59 #include "chrome/renderer/prerender/prerenderer_client.h" 59 #include "chrome/renderer/prerender/prerenderer_client.h"
60 #include "chrome/renderer/printing/print_web_view_helper.h" 60 #include "chrome/renderer/printing/print_web_view_helper.h"
61 #include "chrome/renderer/safe_browsing/malware_dom_details.h" 61 #include "chrome/renderer/safe_browsing/malware_dom_details.h"
62 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" 62 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
63 #include "chrome/renderer/searchbox/searchbox.h" 63 #include "chrome/renderer/searchbox/searchbox.h"
64 #include "chrome/renderer/searchbox/searchbox_extension.h" 64 #include "chrome/renderer/searchbox/searchbox_extension.h"
65 #include "chrome/renderer/spellchecker/spellcheck.h" 65 #include "chrome/renderer/spellchecker/spellcheck.h"
66 #include "chrome/renderer/spellchecker/spellcheck_provider.h" 66 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
67 #include "chrome/renderer/tts_dispatcher.h" 67 #include "chrome/renderer/tts_dispatcher.h"
68 #include "chrome/renderer/validation_message_agent.h" 68 #include "chrome/renderer/validation_message_agent.h"
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 // Chromium for Android doesn't support prerender yet. 470 // Chromium for Android doesn't support prerender yet.
471 closure.Run(); 471 closure.Run();
472 return; 472 return;
473 #else 473 #else
474 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) { 474 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) {
475 closure.Run(); 475 closure.Run();
476 return; 476 return;
477 } 477 }
478 478
479 // Lifetime is tied to |render_view| via content::RenderViewObserver. 479 // Lifetime is tied to |render_view| via content::RenderViewObserver.
480 new prerender::PrerenderWebMediaPlayer(render_view, closure); 480 new prerender::PrerenderMediaLoadDeferrer(render_view, closure);
481 #endif 481 #endif
482 } 482 }
483 483
484 WebPlugin* ChromeContentRendererClient::CreatePlugin( 484 WebPlugin* ChromeContentRendererClient::CreatePlugin(
485 content::RenderView* render_view, 485 content::RenderView* render_view,
486 WebFrame* frame, 486 WebFrame* frame,
487 const WebPluginParams& original_params, 487 const WebPluginParams& original_params,
488 const ChromeViewHostMsg_GetPluginInfo_Output& output) { 488 const ChromeViewHostMsg_GetPluginInfo_Output& output) {
489 const ChromeViewHostMsg_GetPluginInfo_Status& status = output.status; 489 const ChromeViewHostMsg_GetPluginInfo_Status& status = output.status;
490 const WebPluginInfo& plugin = output.plugin; 490 const WebPluginInfo& plugin = output.plugin;
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
1278 if (CommandLine::ForCurrentProcess()->HasSwitch( 1278 if (CommandLine::ForCurrentProcess()->HasSwitch(
1279 switches::kEnablePepperTesting)) { 1279 switches::kEnablePepperTesting)) {
1280 return true; 1280 return true;
1281 } 1281 }
1282 #endif // !defined(OS_ANDROID) 1282 #endif // !defined(OS_ANDROID)
1283 return false; 1283 return false;
1284 } 1284 }
1285 1285
1286 1286
1287 } // namespace chrome 1287 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/prerender/prerender_media_load_deferrer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698