Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1691)

Unified Diff: chrome/browser/mac/keystone_glue.mm

Issue 7249003: Move GetVersionStringModifier() and GetChannel() from platform_util_* to chrome_version_info_* (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: correct nits Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/diagnostics/recon_diagnostics.cc ('k') | chrome/browser/platform_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/mac/keystone_glue.mm
diff --git a/chrome/browser/mac/keystone_glue.mm b/chrome/browser/mac/keystone_glue.mm
index ec84eabfc76f368a10421d3e87b0c9715080c7e7..94bcfec5f5345b2236ccdf71d7b8973557a83886 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]) {
« no previous file with comments | « chrome/browser/diagnostics/recon_diagnostics.cc ('k') | chrome/browser/platform_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698