| Index: webkit/glue/simple_webmimeregistry_impl.h
|
| diff --git a/webkit/glue/simple_webmimeregistry_impl.h b/webkit/glue/simple_webmimeregistry_impl.h
|
| index 1a8aa45a6be37b36b1dd7e30d639d70cb497b50b..9d765505b3163e8f733d4723400a81eafb3ab0a4 100644
|
| --- a/webkit/glue/simple_webmimeregistry_impl.h
|
| +++ b/webkit/glue/simple_webmimeregistry_impl.h
|
| @@ -14,34 +14,34 @@
|
| namespace webkit_glue {
|
|
|
| class WEBKIT_GLUE_EXPORT SimpleWebMimeRegistryImpl :
|
| - NON_EXPORTED_BASE(public WebKit::WebMimeRegistry) {
|
| + NON_EXPORTED_BASE(public blink::WebMimeRegistry) {
|
| public:
|
| SimpleWebMimeRegistryImpl() {}
|
| virtual ~SimpleWebMimeRegistryImpl() {}
|
|
|
| // Convert a WebString to ASCII, falling back on an empty string in the case
|
| // of a non-ASCII string.
|
| - static std::string ToASCIIOrEmpty(const WebKit::WebString& string);
|
| + static std::string ToASCIIOrEmpty(const blink::WebString& string);
|
|
|
| // WebMimeRegistry methods:
|
| - virtual WebKit::WebMimeRegistry::SupportsType supportsMIMEType(
|
| - const WebKit::WebString&);
|
| - virtual WebKit::WebMimeRegistry::SupportsType supportsImageMIMEType(
|
| - const WebKit::WebString&);
|
| - virtual WebKit::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
|
| - const WebKit::WebString&);
|
| - virtual WebKit::WebMimeRegistry::SupportsType supportsMediaMIMEType(
|
| - const WebKit::WebString&,
|
| - const WebKit::WebString&,
|
| - const WebKit::WebString&);
|
| - virtual bool supportsMediaSourceMIMEType(const WebKit::WebString&,
|
| - const WebKit::WebString&);
|
| - virtual WebKit::WebMimeRegistry::SupportsType supportsNonImageMIMEType(
|
| - const WebKit::WebString&);
|
| - virtual WebKit::WebString mimeTypeForExtension(const WebKit::WebString&);
|
| - virtual WebKit::WebString wellKnownMimeTypeForExtension(
|
| - const WebKit::WebString&);
|
| - virtual WebKit::WebString mimeTypeFromFile(const WebKit::WebString&);
|
| + virtual blink::WebMimeRegistry::SupportsType supportsMIMEType(
|
| + const blink::WebString&);
|
| + virtual blink::WebMimeRegistry::SupportsType supportsImageMIMEType(
|
| + const blink::WebString&);
|
| + virtual blink::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
|
| + const blink::WebString&);
|
| + virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType(
|
| + const blink::WebString&,
|
| + const blink::WebString&,
|
| + const blink::WebString&);
|
| + virtual bool supportsMediaSourceMIMEType(const blink::WebString&,
|
| + const blink::WebString&);
|
| + virtual blink::WebMimeRegistry::SupportsType supportsNonImageMIMEType(
|
| + const blink::WebString&);
|
| + virtual blink::WebString mimeTypeForExtension(const blink::WebString&);
|
| + virtual blink::WebString wellKnownMimeTypeForExtension(
|
| + const blink::WebString&);
|
| + virtual blink::WebString mimeTypeFromFile(const blink::WebString&);
|
| };
|
|
|
| } // namespace webkit_glue
|
|
|