summaryrefslogtreecommitdiffstats
path: root/webkit/port/bridge
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-18 19:35:24 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-18 19:35:24 +0000
commit3d6293398e26ec2e70f839c4cbba56ba43481f62 (patch)
tree22fe75c93b51361c4139c5a5625eb54209c7f4b6 /webkit/port/bridge
parent468114936d12d25f5dcd3a97be5ab091761b7561 (diff)
downloadchromium_src-3d6293398e26ec2e70f839c4cbba56ba43481f62.zip
chromium_src-3d6293398e26ec2e70f839c4cbba56ba43481f62.tar.gz
chromium_src-3d6293398e26ec2e70f839c4cbba56ba43481f62.tar.bz2
Kill our forked copy of MIMETypeRegistry.cpp by moving the customized methods
into MimeTypeRegistryChromium.cpp, and stop building MIMETypeRegistry.cpp. It turns out that there just isn't enough of that file that we have in common to make it worth sharing. R=dglazkov git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port/bridge')
-rw-r--r--webkit/port/bridge/chromium/PluginsChromium.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/port/bridge/chromium/PluginsChromium.cpp b/webkit/port/bridge/chromium/PluginsChromium.cpp
index b953163..d73e9476 100644
--- a/webkit/port/bridge/chromium/PluginsChromium.cpp
+++ b/webkit/port/bridge/chromium/PluginsChromium.cpp
@@ -124,7 +124,7 @@ public:
return false;
}
- String GetPluginMimeTypeFromExtension(const String& extension)
+ String getPluginMimeTypeFromExtension(const String& extension)
{
#if !defined(__linux__)
// TODO(port): unstub once we have plugin support for Linux
@@ -176,9 +176,9 @@ void refreshPlugins(bool)
pluginCache.load(true);
}
-String GetPluginMimeTypeFromExtension(const String& extension)
+String getPluginMimeTypeFromExtension(const String& extension)
{
- return pluginCache.GetPluginMimeTypeFromExtension(extension);
+ return pluginCache.getPluginMimeTypeFromExtension(extension);
}
} // namespace WebCore