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

Side by Side Diff: chrome/common/chrome_version_info.cc

Issue 9212049: Fix duplicate OFFICIAL_BUILD macros. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: License year fix. Created 8 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/common/chrome_version_info_posix.h.version » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_version_info.h" 5 #include "chrome/common/chrome_version_info.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/file_version_info.h" 8 #include "base/file_version_info.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 std::string VersionInfo::Version() const { 80 std::string VersionInfo::Version() const {
81 return PRODUCT_VERSION; 81 return PRODUCT_VERSION;
82 } 82 }
83 83
84 std::string VersionInfo::LastChange() const { 84 std::string VersionInfo::LastChange() const {
85 return LAST_CHANGE; 85 return LAST_CHANGE;
86 } 86 }
87 87
88 bool VersionInfo::IsOfficialBuild() const { 88 bool VersionInfo::IsOfficialBuild() const {
89 return OFFICIAL_BUILD; 89 return IS_OFFICIAL_BUILD;
90 } 90 }
91 91
92 #endif 92 #endif
93 93
94 std::string VersionInfo::CreateVersionString() const { 94 std::string VersionInfo::CreateVersionString() const {
95 std::string current_version; 95 std::string current_version;
96 if (is_valid()) { 96 if (is_valid()) {
97 current_version += Version(); 97 current_version += Version();
98 #if !defined(GOOGLE_CHROME_BUILD) 98 #if !defined(GOOGLE_CHROME_BUILD)
99 current_version += " ("; 99 current_version += " (";
(...skipping 25 matching lines...) Expand all
125 #elif defined(OS_OPENBSD) 125 #elif defined(OS_OPENBSD)
126 return "OpenBSD"; 126 return "OpenBSD";
127 #elif defined(OS_SOLARIS) 127 #elif defined(OS_SOLARIS)
128 return "Solaris"; 128 return "Solaris";
129 #else 129 #else
130 return "Unknown"; 130 return "Unknown";
131 #endif 131 #endif
132 } 132 }
133 133
134 } // namespace chrome 134 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_version_info_posix.h.version » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698