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

Side by Side Diff: webkit/glue/simple_webmimeregistry_impl.cc

Issue 351001: Revert "Eliminate mime_util dependency from WebFrameLoaderClient." (Closed)
Patch Set: Created 11 years, 1 month 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
« no previous file with comments | « webkit/glue/simple_webmimeregistry_impl.h ('k') | no next file » | 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) 2009 The Chromium Authors. All rights reserved. Use of this 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
2 // source code is governed by a BSD-style license that can be found in the 2 // source code is governed by a BSD-style license that can be found in the
3 // LICENSE file. 3 // LICENSE file.
4 4
5 #include "webkit/glue/simple_webmimeregistry_impl.h" 5 #include "webkit/glue/simple_webmimeregistry_impl.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/sys_string_conversions.h" 8 #include "base/sys_string_conversions.h"
9 #include "net/base/mime_util.h" 9 #include "net/base/mime_util.h"
10 #include "webkit/api/public/WebString.h" 10 #include "webkit/api/public/WebString.h"
(...skipping 10 matching lines...) Expand all
21 std::string AsASCII(const WebString& string) { 21 std::string AsASCII(const WebString& string) {
22 if (!IsStringASCII(string)) 22 if (!IsStringASCII(string))
23 return EmptyString(); 23 return EmptyString();
24 return UTF16ToASCII(string); 24 return UTF16ToASCII(string);
25 } 25 }
26 26
27 } // namespace 27 } // namespace
28 28
29 namespace webkit_glue { 29 namespace webkit_glue {
30 30
31 WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsMIMEType(
32 const WebString& mime_type) {
33 if (!net::IsSupportedMimeType(AsASCII(mime_type).c_str()))
34 return WebMimeRegistry::IsNotSupported;
35 return WebMimeRegistry::IsSupported;
36 }
37
38 WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsImageMIMEType( 31 WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsImageMIMEType(
39 const WebString& mime_type) { 32 const WebString& mime_type) {
40 if (!net::IsSupportedImageMimeType(AsASCII(mime_type).c_str())) 33 if (!net::IsSupportedImageMimeType(AsASCII(mime_type).c_str()))
41 return WebMimeRegistry::IsNotSupported; 34 return WebMimeRegistry::IsNotSupported;
42 return WebMimeRegistry::IsSupported; 35 return WebMimeRegistry::IsSupported;
43 } 36 }
44 37
45 WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsJavaScriptMIMET ype( 38 WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsJavaScriptMIMET ype(
46 const WebString& mime_type) { 39 const WebString& mime_type) {
47 if (!net::IsSupportedJavascriptMimeType(AsASCII(mime_type).c_str())) 40 if (!net::IsSupportedJavascriptMimeType(AsASCII(mime_type).c_str()))
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 83
91 WebString SimpleWebMimeRegistryImpl::preferredExtensionForMIMEType( 84 WebString SimpleWebMimeRegistryImpl::preferredExtensionForMIMEType(
92 const WebString& mime_type) { 85 const WebString& mime_type) {
93 FilePath::StringType file_extension; 86 FilePath::StringType file_extension;
94 net::GetPreferredExtensionForMimeType(AsASCII(mime_type), 87 net::GetPreferredExtensionForMimeType(AsASCII(mime_type),
95 &file_extension); 88 &file_extension);
96 return FilePathStringToWebString(file_extension); 89 return FilePathStringToWebString(file_extension);
97 } 90 }
98 91
99 } // namespace webkit_glue 92 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/simple_webmimeregistry_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698