chrome/browser/chromeos/login/help_app_launcher.cc - Issue 6272012: Temporary whitelist several cases of disk I/O on the UI threads in cros.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/help_app_launcher.cc

Issue 6272012: Temporary whitelist several cases of disk I/O on the UI threads in cros. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/chromeos

Patch Set: remove UI thread restriction, nits Created 9 years, 11 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/browser/chromeos/login/apply_services_customization.cc ('k') | chrome/browser/chromeos/login/language_switch_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/help_app_launcher.cc

diff --git a/chrome/browser/chromeos/login/help_app_launcher.cc b/chrome/browser/chromeos/login/help_app_launcher.cc

index 2db8032f3aab4230b830aa27f353c8fff7947503..8a5d06213e9047dd497102d032e5e632797491b9 100644

--- a/chrome/browser/chromeos/login/help_app_launcher.cc

+++ b/chrome/browser/chromeos/login/help_app_launcher.cc

@@ -6,6 +6,7 @@

#include "base/file_util.h"

#include "base/logging.h"

+#include "base/threading/thread_restrictions.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/chromeos/login/help_app_launcher.h"

#include "chrome/common/url_constants.h"

@@ -39,6 +40,9 @@ HelpAppLauncher::HelpAppLauncher(gfx::NativeWindow parent_window)

// returns GURL instance for it. Otherwise returns an empty GURL.

static GURL GetLocalFileUrl(const std::string& base_path,

const std::string& filename) {

+ // Checking for help dir existence causes us to do blocking IO on UI thread.

+ // Temporarily allow it until we fix http://crosbug.com/11105

+ base::ThreadRestrictions::ScopedAllowIO allow_io;

FilePath file_path(base_path + filename);

if (file_util::PathExists(file_path)) {

const std::string path_url = std::string(chrome::kFileScheme) +