chrome/browser/mac/keystone_glue.mm - Issue 1257633002: Componentize VersionInfo.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1257633002: Componentize VersionInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Convert version_info::Channel to a "class enum" Created 5 years, 5 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:

Index: chrome/browser/mac/keystone_glue.mm

diff --git a/chrome/browser/mac/keystone_glue.mm b/chrome/browser/mac/keystone_glue.mm

index e1d2db5ee5441ad14c15239b8820e8e13dd2fcd7..ae989452a7507b7967c7e4f6dc6936e86bd10b0b 100644

--- a/chrome/browser/mac/keystone_glue.mm

+++ b/chrome/browser/mac/keystone_glue.mm

@@ -331,10 +331,10 @@ NSString* const kVersionKey = @"KSVersion";

brandFileType_ = kBrandFileTypeNone;

// Only the stable channel has a brand code.

- chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();

+ version_info::Channel channel = chrome::VersionInfo::GetChannel();

- if (channel == chrome::VersionInfo::CHANNEL_DEV ||

- channel == chrome::VersionInfo::CHANNEL_BETA) {

+ if (channel == version_info::Channel::DEV ||

+ channel == version_info::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

@@ -349,7 +349,7 @@ NSString* const kVersionKey = @"KSVersion";

[fm removeItemAtPath:userBrandFile error:NULL];

}

- } else if (channel == chrome::VersionInfo::CHANNEL_STABLE) {

+ } else if (channel == version_info::Channel::STABLE) {

// If there is a system brand file, use it.

if ([fm fileExistsAtPath:systemBrandFile]) {

« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/mac/master_prefs.mm » ('j') | no next file with comments »