summaryrefslogtreecommitdiffstats
path: root/net/url_request/url_request_inet_job.h
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 01:36:21 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 01:36:21 +0000
commit2d150cb841c79626f0b15e7ef675042f3b9fafc6 (patch)
treef0c80887fea68fde16a227acfd18ba44dadbe8ae /net/url_request/url_request_inet_job.h
parent2cd7eb8743299ff81a2c7054650b21c5a11dd376 (diff)
downloadchromium_src-2d150cb841c79626f0b15e7ef675042f3b9fafc6.zip
chromium_src-2d150cb841c79626f0b15e7ef675042f3b9fafc6.tar.gz
chromium_src-2d150cb841c79626f0b15e7ef675042f3b9fafc6.tar.bz2
Fix the FTP implementation. Our change to make the MessageLoopForIO not
process windows messages broke FTP. This fixes it to work using PostTask. R=rvargas Review URL: http://codereview.chromium.org/11502 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_inet_job.h')
-rw-r--r--net/url_request/url_request_inet_job.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/url_request/url_request_inet_job.h b/net/url_request/url_request_inet_job.h
index 8d3a41c..6341105 100644
--- a/net/url_request/url_request_inet_job.h
+++ b/net/url_request/url_request_inet_job.h
@@ -8,6 +8,7 @@
#include <windows.h>
#include <wininet.h>
+#include "base/lock.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_job.h"
@@ -125,10 +126,6 @@ protected:
// One-time global state setup
static void InitializeTheInternet(const std::string& user_agent);
- // Runs on the thread where the first URLRequest was created
- static LRESULT CALLBACK URLRequestWndProc(HWND hwnd, UINT message,
- WPARAM wparam, LPARAM lparam);
-
// Runs on some background thread (called by WinInet)
static void CALLBACK URLRequestStatusCallback(HINTERNET handle,
DWORD_PTR job_id,
@@ -137,7 +134,6 @@ protected:
DWORD status_info_len);
static HINTERNET the_internet_;
- static HWND message_hwnd_;
#ifndef NDEBUG
static MessageLoop* my_message_loop_; // Used to sanity-check that all
// requests are made on the same
@@ -156,6 +152,9 @@ protected:
// can reuse the async_result_ member for all its asynchronous IOs.
AsyncResult async_result_;
+ Lock loop_lock_;
+ MessageLoop* loop_;
+
DISALLOW_EVIL_CONSTRUCTORS(URLRequestInetJob);
};