diff options
| author | haraken@google.com <haraken@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 18:39:12 +0000 |
|---|---|---|
| committer | haraken@google.com <haraken@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 18:39:12 +0000 |
| commit | f44f0a822af7153715776df850d43e7dee4b44ba (patch) | |
| tree | 2edd15ceb2430e075f9b2f3384af95b6c3d1550f /chrome/browser/mac | |
| parent | a920effbdf6a9bccff256c2e6396ed7ddf4e5b0a (diff) | |
| download | chromium_src-f44f0a822af7153715776df850d43e7dee4b44ba.zip chromium_src-f44f0a822af7153715776df850d43e7dee4b44ba.tar.gz chromium_src-f44f0a822af7153715776df850d43e7dee4b44ba.tar.bz2 | |
Move GetVersionStringModifier() and GetChannel() from platform_util_* to chrome_version_info_*
BUG=37186
TEST=No behavior change. Manually confirm that build succeeds on Linux, Mac and Windows if we comment out '#if defined(GOOGLE_CHROME_BUILD)' in chrome_version_info_*.
Review URL: http://codereview.chromium.org/7249003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/mac')
| -rw-r--r-- | chrome/browser/mac/keystone_glue.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/mac/keystone_glue.mm b/chrome/browser/mac/keystone_glue.mm index ec84eab..94bcfec 100644 --- a/chrome/browser/mac/keystone_glue.mm +++ b/chrome/browser/mac/keystone_glue.mm @@ -18,8 +18,8 @@ #include "base/threading/worker_pool.h" #include "chrome/browser/mac/authorization_util.h" #import "chrome/browser/mac/keystone_registration.h" -#include "chrome/browser/platform_util.h" #include "chrome/common/chrome_constants.h" +#include "chrome/common/chrome_version_info.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -298,10 +298,10 @@ NSString* const kVersionKey = @"KSVersion"; brandFileType_ = kBrandFileTypeNone; // Only the stable channel has a brand code. - platform_util::Channel channel = platform_util::GetChannel(); + chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); - if (channel == platform_util::CHANNEL_DEV || - channel == platform_util::CHANNEL_BETA) { + if (channel == chrome::VersionInfo::CHANNEL_DEV || + channel == chrome::VersionInfo::CHANNEL_BETA) { // If on the dev or beta channel, this installation may have replaced // an older system-level installation. Check for a user brand file and @@ -316,7 +316,7 @@ NSString* const kVersionKey = @"KSVersion"; [fm removeItemAtPath:userBrandFile error:NULL]; } - } else if (channel == platform_util::CHANNEL_STABLE) { + } else if (channel == chrome::VersionInfo::CHANNEL_STABLE) { // If there is a system brand file, use it. if ([fm fileExistsAtPath:systemBrandFile]) { |