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

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

Issue 10963033: Set Chrome VersionInfo for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | 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) 2012 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"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 X"; 119 return "Mac OS X";
120 #elif defined(OS_CHROMEOS) 120 #elif defined(OS_CHROMEOS)
121 if (ui::ResourceBundle::HasSharedInstance()) 121 if (ui::ResourceBundle::HasSharedInstance())
122 return UTF16ToASCII(l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME)); 122 return UTF16ToASCII(l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME));
123 else 123 else
124 return "Chromium OS"; 124 return "Chromium OS";
125 #elif defined(OS_ANDROID)
126 return "Android";
125 #elif defined(OS_LINUX) 127 #elif defined(OS_LINUX)
126 return "Linux"; 128 return "Linux";
127 #elif defined(OS_FREEBSD) 129 #elif defined(OS_FREEBSD)
128 return "FreeBSD"; 130 return "FreeBSD";
129 #elif defined(OS_OPENBSD) 131 #elif defined(OS_OPENBSD)
130 return "OpenBSD"; 132 return "OpenBSD";
131 #elif defined(OS_SOLARIS) 133 #elif defined(OS_SOLARIS)
132 return "Solaris"; 134 return "Solaris";
133 #else 135 #else
134 return "Unknown"; 136 return "Unknown";
135 #endif 137 #endif
136 } 138 }
137 139
138 } // namespace chrome 140 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698