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

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

Issue 7461058: Unify the version string to be displayed on "About Chromium" dialog. (2/6) (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Step 2 Created 9 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/cocoa/about_window_controller.mm ('k') | no next file » | 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) 2011 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"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 current_version += " " + modifier; 109 current_version += " " + modifier;
110 } 110 }
111 #endif // !defined(NACL_WIN64) 111 #endif // !defined(NACL_WIN64)
112 return current_version; 112 return current_version;
113 } 113 }
114 114
115 std::string VersionInfo::OSType() const { 115 std::string VersionInfo::OSType() const {
116 #if defined(OS_WIN) 116 #if defined(OS_WIN)
117 return "Windows"; 117 return "Windows";
118 #elif defined(OS_MACOSX) 118 #elif defined(OS_MACOSX)
119 return "Mac OS"; 119 return "Mac OS X";
120 #elif defined(OS_CHROMEOS) 120 #elif defined(OS_CHROMEOS)
121 return UTF16ToASCII(l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME)); 121 return UTF16ToASCII(l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME));
122 #elif defined(OS_LINUX) 122 #elif defined(OS_LINUX)
123 return "Linux"; 123 return "Linux";
124 #elif defined(OS_FREEBSD) 124 #elif defined(OS_FREEBSD)
125 return "FreeBSD"; 125 return "FreeBSD";
126 #elif defined(OS_OPENBSD) 126 #elif defined(OS_OPENBSD)
127 return "OpenBSD"; 127 return "OpenBSD";
128 #elif defined(OS_SOLARIS) 128 #elif defined(OS_SOLARIS)
129 return "Solaris"; 129 return "Solaris";
130 #else 130 #else
131 return "Unknown"; 131 return "Unknown";
132 #endif 132 #endif
133 } 133 }
134 134
135 } // namespace chrome 135 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/about_window_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698