summaryrefslogtreecommitdiffstats
path: root/chrome/browser/printing/print_job.cc
diff options
context:
space:
mode:
authorkmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 18:51:47 +0000
committerkmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 18:51:47 +0000
commit58bb1b8ba0f99a2973f55a8c91241d7d6d3f9f87 (patch)
tree6c5f211e1b99c3961e17ce5aec9c7ac5dcaff56f /chrome/browser/printing/print_job.cc
parent32ba25f8130e85dc5189b06490156c1df4f0cee8 (diff)
downloadchromium_src-58bb1b8ba0f99a2973f55a8c91241d7d6d3f9f87.zip
chromium_src-58bb1b8ba0f99a2973f55a8c91241d7d6d3f9f87.tar.gz
chromium_src-58bb1b8ba0f99a2973f55a8c91241d7d6d3f9f87.tar.bz2
Printing: Allow file IO on the UI thread.
BUG=67044 TEST=Printing don't trigger AssertIOAllowed DCHECKs. Review URL: http://codereview.chromium.org/5832005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing/print_job.cc')
-rw-r--r--chrome/browser/printing/print_job.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
index c67b8f5..db57103 100644
--- a/chrome/browser/printing/print_job.cc
+++ b/chrome/browser/printing/print_job.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/printing/print_job.h"
#include "base/message_loop.h"
+#include "base/thread_restrictions.h"
#include "base/timer.h"
#include "chrome/browser/printing/print_job_worker.h"
#include "chrome/common/notification_service.h"
@@ -336,6 +337,10 @@ void PrintJob::ControlledWorkerShutdown() {
}
#endif
+ // Temporarily allow it until we fix
+ // http://code.google.com/p/chromium/issues/detail?id=67044
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+
// Now make sure the thread object is cleaned up.
worker_->Stop();
}