Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 40 #include "chrome/renderer/extensions/extension_resource_request_policy.h" | 40 #include "chrome/renderer/extensions/extension_resource_request_policy.h" |
| 41 #include "chrome/renderer/extensions/renderer_extension_bindings.h" | 41 #include "chrome/renderer/extensions/renderer_extension_bindings.h" |
| 42 #include "chrome/renderer/external_extension.h" | 42 #include "chrome/renderer/external_extension.h" |
| 43 #include "chrome/renderer/loadtimes_extension_bindings.h" | 43 #include "chrome/renderer/loadtimes_extension_bindings.h" |
| 44 #include "chrome/renderer/localized_error.h" | 44 #include "chrome/renderer/localized_error.h" |
| 45 #include "chrome/renderer/net/renderer_net_predictor.h" | 45 #include "chrome/renderer/net/renderer_net_predictor.h" |
| 46 #include "chrome/renderer/page_click_tracker.h" | 46 #include "chrome/renderer/page_click_tracker.h" |
| 47 #include "chrome/renderer/page_load_histograms.h" | 47 #include "chrome/renderer/page_load_histograms.h" |
| 48 #include "chrome/renderer/plugin_uma.h" | 48 #include "chrome/renderer/plugin_uma.h" |
| 49 #include "chrome/renderer/prerender/prerender_helper.h" | 49 #include "chrome/renderer/prerender/prerender_helper.h" |
| 50 #include "chrome/renderer/prerender/prerender_webmediaplayer.h" | |
| 50 #include "chrome/renderer/print_web_view_helper.h" | 51 #include "chrome/renderer/print_web_view_helper.h" |
| 51 #include "chrome/renderer/renderer_histogram_snapshots.h" | 52 #include "chrome/renderer/renderer_histogram_snapshots.h" |
| 52 #include "chrome/renderer/safe_browsing/malware_dom_details.h" | 53 #include "chrome/renderer/safe_browsing/malware_dom_details.h" |
| 53 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" | 54 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" |
| 54 #include "chrome/renderer/search_extension.h" | 55 #include "chrome/renderer/search_extension.h" |
| 55 #include "chrome/renderer/searchbox.h" | 56 #include "chrome/renderer/searchbox.h" |
| 56 #include "chrome/renderer/searchbox_extension.h" | 57 #include "chrome/renderer/searchbox_extension.h" |
| 57 #include "chrome/renderer/spellchecker/spellcheck.h" | 58 #include "chrome/renderer/spellchecker/spellcheck.h" |
| 58 #include "chrome/renderer/spellchecker/spellcheck_provider.h" | 59 #include "chrome/renderer/spellchecker/spellcheck_provider.h" |
| 59 #include "chrome/renderer/translate_helper.h" | 60 #include "chrome/renderer/translate_helper.h" |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 271 const WebPluginParams& params, | 272 const WebPluginParams& params, |
| 272 WebKit::WebPlugin** plugin) { | 273 WebKit::WebPlugin** plugin) { |
| 273 bool is_default_plugin; | 274 bool is_default_plugin; |
| 274 *plugin = CreatePlugin(render_view, frame, params, &is_default_plugin); | 275 *plugin = CreatePlugin(render_view, frame, params, &is_default_plugin); |
| 275 if (!*plugin || is_default_plugin) | 276 if (!*plugin || is_default_plugin) |
| 276 MissingPluginReporter::GetInstance()->ReportPluginMissing( | 277 MissingPluginReporter::GetInstance()->ReportPluginMissing( |
| 277 params.mimeType.utf8(), params.url); | 278 params.mimeType.utf8(), params.url); |
| 278 return true; | 279 return true; |
| 279 } | 280 } |
| 280 | 281 |
| 282 bool ChromeContentRendererClient::ShouldOverrideCreateWebMediaPlayer( | |
| 283 RenderView* view) { | |
| 284 return prerender::PrerenderHelper::IsPrerendering(view); | |
| 285 } | |
| 286 | |
| 287 void ChromeContentRendererClient::OverrideCreateWebMediaPlayer( | |
| 288 RenderView* render_view, | |
| 289 WebKit::WebMediaPlayerClient* client, | |
| 290 media::FilterCollection* collection, | |
| 291 media::MessageLoopFactory* message_loop_factory, | |
| 292 webkit_glue::MediaStreamClient* media_stream_client, | |
| 293 media::MediaLog* media_log, | |
| 294 webkit_glue::WebMediaPlayerImpl** player) { | |
| 295 DCHECK(!prerender::PrerenderHelper::IsPrerendering(render_view)); | |
|
scherkus (not reviewing)
2011/10/03 18:19:45
call ShouldOverrideXXX() method instead?
also, wh
Shishir
2011/10/04 23:02:39
Changed to ShouldOverrideCreateWebMediaPlayer().
scherkus (not reviewing)
2011/10/05 20:21:58
I'm pretty indifferent -- if you feel the current
| |
| 296 *player = new prerender::PrerenderWebMediaPlayer(render_view, client, | |
| 297 collection, message_loop_factory, media_stream_client, media_log); | |
| 298 } | |
| 299 | |
| 281 WebPlugin* ChromeContentRendererClient::CreatePlugin( | 300 WebPlugin* ChromeContentRendererClient::CreatePlugin( |
| 282 RenderView* render_view, | 301 RenderView* render_view, |
| 283 WebFrame* frame, | 302 WebFrame* frame, |
| 284 const WebPluginParams& original_params, | 303 const WebPluginParams& original_params, |
| 285 bool* is_default_plugin) { | 304 bool* is_default_plugin) { |
| 286 *is_default_plugin = false; | 305 *is_default_plugin = false; |
| 287 CommandLine* cmd = CommandLine::ForCurrentProcess(); | 306 CommandLine* cmd = CommandLine::ForCurrentProcess(); |
| 288 webkit::WebPluginInfo info; | 307 webkit::WebPluginInfo info; |
| 289 GURL url(original_params.url); | 308 GURL url(original_params.url); |
| 290 std::string orig_mime_type = original_params.mimeType.utf8(); | 309 std::string orig_mime_type = original_params.mimeType.utf8(); |
| (...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 769 if (spellcheck_.get()) | 788 if (spellcheck_.get()) |
| 770 thread->RemoveObserver(spellcheck_.get()); | 789 thread->RemoveObserver(spellcheck_.get()); |
| 771 SpellCheck* new_spellcheck = new SpellCheck(); | 790 SpellCheck* new_spellcheck = new SpellCheck(); |
| 772 if (spellcheck_provider_) | 791 if (spellcheck_provider_) |
| 773 spellcheck_provider_->SetSpellCheck(new_spellcheck); | 792 spellcheck_provider_->SetSpellCheck(new_spellcheck); |
| 774 spellcheck_.reset(new_spellcheck); | 793 spellcheck_.reset(new_spellcheck); |
| 775 thread->AddObserver(new_spellcheck); | 794 thread->AddObserver(new_spellcheck); |
| 776 } | 795 } |
| 777 | 796 |
| 778 } // namespace chrome | 797 } // namespace chrome |
| OLD | NEW |