diff options
author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 10:35:30 +0000 |
---|---|---|
committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 10:35:30 +0000 |
commit | 931b44bdaa496f79c0f3a2d14c6135f0c8c24c20 (patch) | |
tree | 409d8894d0b1b3595089b87749193e8f0de4f5b4 /chrome/browser/sync/profile_sync_service.cc | |
parent | 5855deb354d98f00e786b2646a02872cdff81d75 (diff) | |
download | chromium_src-931b44bdaa496f79c0f3a2d14c6135f0c8c24c20.zip chromium_src-931b44bdaa496f79c0f3a2d14c6135f0c8c24c20.tar.gz chromium_src-931b44bdaa496f79c0f3a2d14c6135f0c8c24c20.tar.bz2 |
Adding a scoped_allowio for ProfileSyncService until we can evaluate.
TBR=chron
BUG=70380
TEST=None
Review URL: http://codereview.chromium.org/6315010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service.cc')
-rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 7b36f89..4374120 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -17,6 +17,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/task.h" +#include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_signin.h" #include "chrome/browser/history/history_types.h" @@ -92,9 +93,11 @@ ProfileSyncService::ProfileSyncService(ProfileSyncFactory* factory, // Dev servers have more features than standard sync servers. // Chrome stable and beta builds will go to the standard sync servers. #if defined(GOOGLE_CHROME_BUILD) + // GetVersionStringModifier hits the registry. See http://crbug.com/70380. + base::ThreadRestrictions::ScopedAllowIO allow_io; // For stable, this is "". For dev, this is "dev". For beta, this is "beta". // For daily, this is "canary build". - // For linux Chromium builds, this could be anything depending on the + // For Linux Chromium builds, this could be anything depending on the // distribution, so always direct those users to dev server urls. // If this is an official build, it will always be one of the above. std::string channel = platform_util::GetVersionStringModifier(); |