Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: chrome_frame/urlmon_url_request.cc

Issue 11048029: Allow Thread to initialize COM for Windows consumers who need it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/urlmon_url_request.h ('k') | chrome_frame/utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/urlmon_url_request.cc
===================================================================
--- chrome_frame/urlmon_url_request.cc (revision 163371)
+++ chrome_frame/urlmon_url_request.cc (working copy)
@@ -15,6 +15,7 @@
#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/threading/platform_thread.h"
+#include "base/threading/thread.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/automation_messages.h"
#include "chrome_frame/bind_context_info.h"
@@ -1401,8 +1402,8 @@
privileged_mode_(false),
container_(NULL),
background_worker_thread_enabled_(true) {
- background_thread_.reset(new ResourceFetcherThread(
- "cf_iexplore_background_thread"));
+ background_thread_.reset(new base::Thread("cf_iexplore_background_thread"));
+ background_thread_->init_com_with_mta(false);
background_worker_thread_enabled_ =
GetConfigBool(true, kUseBackgroundThreadForSubResources);
if (background_worker_thread_enabled_) {
@@ -1445,19 +1446,3 @@
0);
}
}
-
-UrlmonUrlRequestManager::ResourceFetcherThread::ResourceFetcherThread(
- const char* name) : base::Thread(name) {
-}
-
-UrlmonUrlRequestManager::ResourceFetcherThread::~ResourceFetcherThread() {
- Stop();
-}
-
-void UrlmonUrlRequestManager::ResourceFetcherThread::Init() {
- com_initializer_.reset(new base::win::ScopedCOMInitializer());
-}
-
-void UrlmonUrlRequestManager::ResourceFetcherThread::CleanUp() {
- com_initializer_.reset();
-}
« no previous file with comments | « chrome_frame/urlmon_url_request.h ('k') | chrome_frame/utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698