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

Unified Diff: content/renderer/renderer_blink_platform_impl.cc

Issue 2444873002: Move WebMIMERegistry impl from //content to blink:platform/network/mime (Closed)
Patch Set: remove indirection Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/renderer_blink_platform_impl.cc
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 4dcd0d9b0a0264615ed9e723d20eae77b6d1e0ff..48c4f6c510bad4695b40fde02371dc3fa095e476 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -31,7 +31,6 @@
#include "content/child/indexed_db/webidbfactory_impl.h"
#include "content/child/quota_dispatcher.h"
#include "content/child/quota_message_filter.h"
-#include "content/child/simple_webmimeregistry_impl.h"
#include "content/child/storage_util.h"
#include "content/child/thread_safe_sender.h"
#include "content/child/web_database_observer_impl.h"
@@ -77,7 +76,6 @@
#include "gpu/ipc/common/gpu_stream_constants.h"
#include "ipc/ipc_sync_message_filter.h"
#include "media/audio/audio_output_device.h"
-#include "media/base/mime_util.h"
#include "media/blink/webcontentdecryptionmodule_impl.h"
#include "media/filters/stream_parser_factory.h"
#include "mojo/common/common_type_converters.h"
@@ -97,7 +95,6 @@
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/WebVector.h"
-#include "third_party/WebKit/public/platform/mime_registry.mojom.h"
#include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceMotionListener.h"
#include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceOrientationListener.h"
#include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h"
@@ -159,7 +156,6 @@ using blink::WebMediaStream;
using blink::WebMediaStreamCenter;
using blink::WebMediaStreamCenterClient;
using blink::WebMediaStreamTrack;
-using blink::WebMimeRegistry;
using blink::WebRTCPeerConnectionHandler;
using blink::WebRTCPeerConnectionHandlerClient;
using blink::WebStorageNamespace;
@@ -193,16 +189,6 @@ media::AudioParameters GetAudioHardwareParams() {
//------------------------------------------------------------------------------
-class RendererBlinkPlatformImpl::MimeRegistry
- : public SimpleWebMimeRegistryImpl {
- public:
- blink::WebString mimeTypeForExtension(
- const blink::WebString& file_extension) override;
-
- private:
- blink::mojom::MimeRegistryPtr mime_registry_;
-};
-
class RendererBlinkPlatformImpl::FileUtilities : public WebFileUtilitiesImpl {
public:
explicit FileUtilities(ThreadSafeSender* sender)
@@ -252,7 +238,6 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
main_thread_(renderer_scheduler->CreateMainThread()),
clipboard_delegate_(new RendererClipboardDelegate),
clipboard_(new WebClipboardImpl(clipboard_delegate_.get())),
- mime_registry_(new RendererBlinkPlatformImpl::MimeRegistry),
sudden_termination_disables_(0),
plugin_refresh_allowed_(true),
default_task_runner_(renderer_scheduler->DefaultTaskRunner()),
@@ -336,10 +321,6 @@ blink::WebClipboard* RendererBlinkPlatformImpl::clipboard() {
return clipboard_.get();
}
-blink::WebMimeRegistry* RendererBlinkPlatformImpl::mimeRegistry() {
- return mime_registry_.get();
-}
-
blink::WebFileUtilities* RendererBlinkPlatformImpl::fileUtilities() {
if (!file_utilities_) {
file_utilities_.reset(new FileUtilities(thread_safe_sender_.get()));
@@ -500,23 +481,6 @@ WebString RendererBlinkPlatformImpl::fileSystemCreateOriginIdentifier(
//------------------------------------------------------------------------------
-WebString RendererBlinkPlatformImpl::MimeRegistry::mimeTypeForExtension(
- const WebString& file_extension) {
- // The sandbox restricts our access to the registry, so we need to proxy
- // these calls over to the browser process.
- if (!mime_registry_)
- RenderThread::Get()->GetRemoteInterfaces()->GetInterface(&mime_registry_);
-
- mojo::String mime_type;
- if (!mime_registry_->GetMimeTypeFromExtension(
- mojo::String::From(base::string16(file_extension)), &mime_type)) {
- return WebString();
- }
- return base::ASCIIToUTF16(mime_type.get());
-}
-
-//------------------------------------------------------------------------------
-
bool RendererBlinkPlatformImpl::FileUtilities::getFileInfo(
const WebString& path,
WebFileInfo& web_file_info) {

Powered by Google App Engine
This is Rietveld 408576698