diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 11:10:17 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 11:10:17 +0000 |
| commit | 3742f8567ec76ae30eb2731744920a0c5f97b94d (patch) | |
| tree | f61124aa4e44cdc97f6622b3e638b38a511cf067 /chrome/browser/web_resource | |
| parent | 88625ae9617f3b044ca6885bb4be15ef8cdc9b68 (diff) | |
| download | chromium_src-3742f8567ec76ae30eb2731744920a0c5f97b94d.zip chromium_src-3742f8567ec76ae30eb2731744920a0c5f97b94d.tar.gz chromium_src-3742f8567ec76ae30eb2731744920a0c5f97b94d.tar.bz2 | |
Add scoped_allowio for WebResourceServiceUtil::CanShowPromo until we can evaluate.
TBR=mirandac
BUG=70898
TEST=None
Review URL: http://codereview.chromium.org/6308015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_resource')
| -rw-r--r-- | chrome/browser/web_resource/web_resource_service.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index fe766a3..d42aa35 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -10,6 +10,7 @@ #include "base/file_path.h" #include "base/string_util.h" #include "base/string_number_conversions.h" +#include "base/threading/thread_restrictions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -558,6 +559,8 @@ bool CanShowPromo(Profile* profile) { sync_ui_util::GetStatus( profile->GetProfileSyncService()) == sync_ui_util::SYNCED); + // GetVersionStringModifier hits the registry. See http://crbug.com/70898. + base::ThreadRestrictions::ScopedAllowIO allow_io; const std::string channel = platform_util::GetVersionStringModifier(); bool is_promo_build = false; if (prefs->HasPrefPath(prefs::kNTPPromoBuild)) { |