summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_tab.cc
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-02 21:19:01 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-02 21:19:01 +0000
commit3e76e27b7504fef3150c8074b88954b679740769 (patch)
treee85a2a8b86f952e43da4856bf0f4d0a55587d7f4 /chrome_frame/chrome_tab.cc
parent6fc9077537613d42871b3ce6a0eb18f3924f6c99 (diff)
downloadchromium_src-3e76e27b7504fef3150c8074b88954b679740769.zip
chromium_src-3e76e27b7504fef3150c8074b88954b679740769.tar.gz
chromium_src-3e76e27b7504fef3150c8074b88954b679740769.tar.bz2
Fix platform_util::GetChannel on Windows.
GetChannel was confused in multi-user installs. It treated them as CHANNEL_UNKNOWN instead of their correct channels. BUG=81218 TEST=none Review URL: http://codereview.chromium.org/6893158 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_tab.cc')
-rw-r--r--chrome_frame/chrome_tab.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 330fd19..b7d2898 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.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.
@@ -308,7 +308,7 @@ HRESULT SetupRunOnce() {
std::wstring channel_name;
if (base::win::GetVersion() < base::win::VERSION_VISTA &&
- GoogleUpdateSettings::GetChromeChannel(true, &channel_name)) {
+ GoogleUpdateSettings::GetChromeChannelAndModifiers(true, &channel_name)) {
std::transform(channel_name.begin(), channel_name.end(),
channel_name.begin(), tolower);
// Use this only for the dev channel and CEEE channels.