chrome/common/metrics/version_utils.cc - Issue 1269773002: Cleanup VersionInfo after componentization.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/common/metrics/version_utils.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 4 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/common/metrics/version_utils.h"	5 #include "chrome/common/metrics/version_utils.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

	8 #include "components/version_info/version_info.h"

8 #include "components/version_info/version_info_values.h"	9 #include "components/version_info/version_info_values.h"

9	10

10 namespace metrics {	11 namespace metrics {

11	12

12 std::string GetVersionString() {	13 std::string GetVersionString() {

13 std::string version = PRODUCT_VERSION;	14 std::string version = PRODUCT_VERSION;

14 #if defined(ARCH_CPU_64_BITS)	15 #if defined(ARCH_CPU_64_BITS)

15 version += "-64";	16 version += "-64";

16 #endif // defined(ARCH_CPU_64_BITS)	17 #endif // defined(ARCH_CPU_64_BITS)

17 if (!IS_OFFICIAL_BUILD)	18 if (!IS_OFFICIAL_BUILD)

(...skipping 13 matching lines...) Expand all Loading...
31 case version_info::Channel::BETA:	32 case version_info::Channel::BETA:

32 return SystemProfileProto::CHANNEL_BETA;	33 return SystemProfileProto::CHANNEL_BETA;

33 case version_info::Channel::STABLE:	34 case version_info::Channel::STABLE:

34 return SystemProfileProto::CHANNEL_STABLE;	35 return SystemProfileProto::CHANNEL_STABLE;

35 }	36 }

36 NOTREACHED();	37 NOTREACHED();

37 return SystemProfileProto::CHANNEL_UNKNOWN;	38 return SystemProfileProto::CHANNEL_UNKNOWN;

38 }	39 }

39	40

40 } // namespace metrics	41 } // namespace metrics

OLD	NEW

« no previous file with comments | « chrome/common/metrics/version_utils.h ('k') | chrome/common/pepper_permission_util_unittest.cc » ('j') | no next file with comments »