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

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

Issue 1483733002: Remove support for NPObjects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad rebase. Created 4 years, 9 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
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/renderer_blink_platform_impl.h" 5 #include "content/renderer/renderer_blink_platform_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 11 matching lines...) Expand all
22 #include "cc/blink/context_provider_web_context.h" 22 #include "cc/blink/context_provider_web_context.h"
23 #include "components/scheduler/child/web_scheduler_impl.h" 23 #include "components/scheduler/child/web_scheduler_impl.h"
24 #include "components/scheduler/child/web_task_runner_impl.h" 24 #include "components/scheduler/child/web_task_runner_impl.h"
25 #include "components/scheduler/renderer/renderer_scheduler.h" 25 #include "components/scheduler/renderer/renderer_scheduler.h"
26 #include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h" 26 #include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
27 #include "components/url_formatter/url_formatter.h" 27 #include "components/url_formatter/url_formatter.h"
28 #include "content/child/database_util.h" 28 #include "content/child/database_util.h"
29 #include "content/child/file_info_util.h" 29 #include "content/child/file_info_util.h"
30 #include "content/child/fileapi/webfilesystem_impl.h" 30 #include "content/child/fileapi/webfilesystem_impl.h"
31 #include "content/child/indexed_db/webidbfactory_impl.h" 31 #include "content/child/indexed_db/webidbfactory_impl.h"
32 #include "content/child/npapi/npobject_util.h"
33 #include "content/child/quota_dispatcher.h" 32 #include "content/child/quota_dispatcher.h"
34 #include "content/child/quota_message_filter.h" 33 #include "content/child/quota_message_filter.h"
35 #include "content/child/simple_webmimeregistry_impl.h" 34 #include "content/child/simple_webmimeregistry_impl.h"
36 #include "content/child/thread_safe_sender.h" 35 #include "content/child/thread_safe_sender.h"
37 #include "content/child/web_database_observer_impl.h" 36 #include "content/child/web_database_observer_impl.h"
38 #include "content/child/web_url_loader_impl.h" 37 #include "content/child/web_url_loader_impl.h"
39 #include "content/child/webblobregistry_impl.h" 38 #include "content/child/webblobregistry_impl.h"
40 #include "content/child/webfileutilities_impl.h" 39 #include "content/child/webfileutilities_impl.h"
41 #include "content/child/webmessageportchannel_impl.h" 40 #include "content/child/webmessageportchannel_impl.h"
42 #include "content/common/file_utilities_messages.h" 41 #include "content/common/file_utilities_messages.h"
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 std::vector<std::string> parsed_codec_ids; 467 std::vector<std::string> parsed_codec_ids;
469 media::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codec_ids, false); 468 media::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codec_ids, false);
470 if (mime_type_ascii.empty()) 469 if (mime_type_ascii.empty())
471 return false; 470 return false;
472 return media::StreamParserFactory::IsTypeSupported( 471 return media::StreamParserFactory::IsTypeSupported(
473 mime_type_ascii, parsed_codec_ids); 472 mime_type_ascii, parsed_codec_ids);
474 } 473 }
475 474
476 WebString RendererBlinkPlatformImpl::MimeRegistry::mimeTypeForExtension( 475 WebString RendererBlinkPlatformImpl::MimeRegistry::mimeTypeForExtension(
477 const WebString& file_extension) { 476 const WebString& file_extension) {
478 if (IsPluginProcess())
479 return SimpleWebMimeRegistryImpl::mimeTypeForExtension(file_extension);
480
481 // The sandbox restricts our access to the registry, so we need to proxy 477 // The sandbox restricts our access to the registry, so we need to proxy
482 // these calls over to the browser process. 478 // these calls over to the browser process.
483 std::string mime_type; 479 std::string mime_type;
484 RenderThread::Get()->Send( 480 RenderThread::Get()->Send(
485 new MimeRegistryMsg_GetMimeTypeFromExtension( 481 new MimeRegistryMsg_GetMimeTypeFromExtension(
486 blink::WebStringToFilePath(file_extension).value(), &mime_type)); 482 blink::WebStringToFilePath(file_extension).value(), &mime_type));
487 return base::ASCIIToUTF16(mime_type); 483 return base::ASCIIToUTF16(mime_type);
488 } 484 }
489 485
490 //------------------------------------------------------------------------------ 486 //------------------------------------------------------------------------------
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 } 1260 }
1265 1261
1266 //------------------------------------------------------------------------------ 1262 //------------------------------------------------------------------------------
1267 1263
1268 blink::WebTrialTokenValidator* 1264 blink::WebTrialTokenValidator*
1269 RendererBlinkPlatformImpl::trialTokenValidator() { 1265 RendererBlinkPlatformImpl::trialTokenValidator() {
1270 return &trial_token_validator_; 1266 return &trial_token_validator_;
1271 } 1267 }
1272 1268
1273 } // namespace content 1269 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698