diff options
| author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 17:04:09 +0000 |
|---|---|---|
| committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 17:04:09 +0000 |
| commit | dd224e13b5371d1d313424247eea37f5b0d20acb (patch) | |
| tree | 5570af9c7b0517accd94caee4c44de1363affc4d /chrome/app/breakpad_win.cc | |
| parent | 402cfefb2da2e34d41f6ec5b84cf3b4dbfbfc9c7 (diff) | |
| download | chromium_src-dd224e13b5371d1d313424247eea37f5b0d20acb.zip chromium_src-dd224e13b5371d1d313424247eea37f5b0d20acb.tar.gz chromium_src-dd224e13b5371d1d313424247eea37f5b0d20acb.tar.bz2 | |
Make sure GoogleUpdateSettings::GetChromeChannel does not read
from the wrong section of registry when a per-user install has left
some registrations behind.
Fix the odd race and other bugs I encountered along the way.
BUG=40994
TEST=Unittests in this change. Open about box and look at the channel string.
Review URL: http://codereview.chromium.org/1582035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/breakpad_win.cc')
| -rw-r--r-- | chrome/app/breakpad_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc index ac8457a..c555e39 100644 --- a/chrome/app/breakpad_win.cc +++ b/chrome/app/breakpad_win.cc @@ -399,7 +399,8 @@ static DWORD __stdcall InitCrashReporterThread(void* param) { } else { // Capture more detail in crash dumps for beta and dev channel builds. string16 channel_string; - GoogleUpdateSettings::GetChromeChannel(&channel_string); + GoogleUpdateSettings::GetChromeChannel(!is_per_user_install, + &channel_string); if (channel_string == L"dev" || channel_string == L"beta") dump_type = kLargerDumpType; } |