| Index: chrome_frame/urlmon_url_request.h
|
| ===================================================================
|
| --- chrome_frame/urlmon_url_request.h (revision 163371)
|
| +++ chrome_frame/urlmon_url_request.h (working copy)
|
| @@ -11,16 +11,13 @@
|
| #include <map>
|
| #include <string>
|
|
|
| -#include "base/threading/thread.h"
|
| #include "chrome_frame/plugin_url_request.h"
|
| #include "chrome_frame/urlmon_moniker.h"
|
| #include "chrome_frame/utils.h"
|
|
|
| namespace base {
|
| -namespace win {
|
| -class ScopedCOMInitializer;
|
| +class Thread;
|
| }
|
| -}
|
|
|
| class UrlmonUrlRequest;
|
|
|
| @@ -28,21 +25,6 @@
|
| : public PluginUrlRequestManager,
|
| public PluginUrlRequestDelegate {
|
| public:
|
| - // Sub resources on the pages in chrome frame are fetched on this thread.
|
| - class ResourceFetcherThread : public base::Thread {
|
| - public:
|
| - explicit ResourceFetcherThread(const char* name);
|
| - virtual ~ResourceFetcherThread();
|
| -
|
| - virtual void Init();
|
| - virtual void CleanUp();
|
| -
|
| - private:
|
| - scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ResourceFetcherThread);
|
| - };
|
| -
|
| // Contains the privacy information for all requests issued by this instance.
|
| struct PrivacyInfo {
|
| public:
|
| @@ -151,7 +133,7 @@
|
| base::Lock* request_map_lock);
|
|
|
| scoped_refptr<UrlmonUrlRequest> pending_request_;
|
| - scoped_ptr<ResourceFetcherThread> background_thread_;
|
| + scoped_ptr<base::Thread> background_thread_;
|
|
|
| bool stopping_;
|
|
|
|
|