diff options
| author | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 20:26:38 +0000 |
|---|---|---|
| committer | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 20:26:38 +0000 |
| commit | fc9023fa5d45af40509a20263142ad7191620e00 (patch) | |
| tree | 57e7cda3d2a78b68eba260a4d98f221e4c151c79 /chrome/installer | |
| parent | 7541206c7a5160f3489d563b97f1c841c853dc22 (diff) | |
| download | chromium_src-fc9023fa5d45af40509a20263142ad7191620e00.zip chromium_src-fc9023fa5d45af40509a20263142ad7191620e00.tar.gz chromium_src-fc9023fa5d45af40509a20263142ad7191620e00.tar.bz2 | |
Fixing Default User Data Directory for SxS install.
TEST=SxS install can run together with normal install.
BUG=35574
Review URL: http://codereview.chromium.org/639002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/util/browser_distribution.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc index aced1fb..27bb8d6 100644 --- a/chrome/installer/util/browser_distribution.cc +++ b/chrome/installer/util/browser_distribution.cc @@ -10,6 +10,7 @@ #include "chrome/installer/util/browser_distribution.h" #include "base/command_line.h" +#include "base/lock.h" #include "base/registry.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" @@ -27,6 +28,8 @@ BrowserDistribution* BrowserDistribution::GetDistribution() { BrowserDistribution* BrowserDistribution::GetDistribution(bool chrome_frame) { static BrowserDistribution* dist = NULL; + static Lock dist_lock; + AutoLock lock(dist_lock); if (dist == NULL) { if (chrome_frame) { // TODO(robertshield): Make one of these for Google Chrome vs |