summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 00:46:41 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 00:46:41 +0000
commit827ea2449764f84344a5e1d5c3b650f29cf2571f (patch)
tree466c052437de015f78c35d72a07dcf233f32dd43 /chrome
parenta571d3d39325f0ae3b2e060f3d274b5903cbafcf (diff)
downloadchromium_src-827ea2449764f84344a5e1d5c3b650f29cf2571f.zip
chromium_src-827ea2449764f84344a5e1d5c3b650f29cf2571f.tar.gz
chromium_src-827ea2449764f84344a5e1d5c3b650f29cf2571f.tar.bz2
Revert r63457, "WorkerWebKitClientImpl::mimeTypeForExtension should not use WorkerThread::current"
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/worker/worker_webkitclient_impl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc
index 1755002..1f74232 100644
--- a/chrome/worker/worker_webkitclient_impl.cc
+++ b/chrome/worker/worker_webkitclient_impl.cc
@@ -228,7 +228,7 @@ WebMimeRegistry::SupportsType WorkerWebKitClientImpl::supportsNonImageMIMEType(
WebString WorkerWebKitClientImpl::mimeTypeForExtension(
const WebString& file_extension) {
std::string mime_type;
- SendSyncMessageFromAnyThread(new ViewHostMsg_GetMimeTypeFromExtension(
+ WorkerThread::current()->Send(new ViewHostMsg_GetMimeTypeFromExtension(
webkit_glue::WebStringToFilePathString(file_extension), &mime_type));
return ASCIIToUTF16(mime_type);
}
@@ -236,7 +236,7 @@ WebString WorkerWebKitClientImpl::mimeTypeForExtension(
WebString WorkerWebKitClientImpl::mimeTypeFromFile(
const WebString& file_path) {
std::string mime_type;
- SendSyncMessageFromAnyThread(new ViewHostMsg_GetMimeTypeFromFile(
+ WorkerThread::current()->Send(new ViewHostMsg_GetMimeTypeFromFile(
FilePath(webkit_glue::WebStringToFilePathString(file_path)),
&mime_type));
return ASCIIToUTF16(mime_type);
@@ -245,7 +245,7 @@ WebString WorkerWebKitClientImpl::mimeTypeFromFile(
WebString WorkerWebKitClientImpl::preferredExtensionForMIMEType(
const WebString& mime_type) {
FilePath::StringType file_extension;
- SendSyncMessageFromAnyThread(
+ WorkerThread::current()->Send(
new ViewHostMsg_GetPreferredExtensionForMimeType(UTF16ToASCII(mime_type),
&file_extension));
return webkit_glue::FilePathStringToWebString(file_extension);