summaryrefslogtreecommitdiffstats
path: root/sync/util
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 23:12:24 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 23:12:24 +0000
commitd3ac5632bf3c69051bd3d58a890aed3ebc1028c6 (patch)
tree1973716e53862ddb6a9b9717dee8cf28c109e41d /sync/util
parent2ba060ff3309507eb854cbd117d2798707c4009a (diff)
downloadchromium_src-d3ac5632bf3c69051bd3d58a890aed3ebc1028c6.zip
chromium_src-d3ac5632bf3c69051bd3d58a890aed3ebc1028c6.tar.gz
chromium_src-d3ac5632bf3c69051bd3d58a890aed3ebc1028c6.tar.bz2
mac: Remove code that was only needed on 10.5
BUG=137676 TEST=none Review URL: https://chromiumcodereview.appspot.com/10807052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/util')
-rw-r--r--sync/util/get_session_name_mac.mm26
1 files changed, 1 insertions, 25 deletions
diff --git a/sync/util/get_session_name_mac.mm b/sync/util/get_session_name_mac.mm
index 6298604..e7d29c4 100644
--- a/sync/util/get_session_name_mac.mm
+++ b/sync/util/get_session_name_mac.mm
@@ -15,36 +15,12 @@
#include "base/sys_info.h"
#include "base/sys_string_conversions.h"
-@interface NSHost(SnowLeopardAPI)
-- (NSString*)localizedName;
-@end
-
namespace syncer {
namespace internal {
std::string GetHardwareModelName() {
NSHost* myHost = [NSHost currentHost];
- if ([myHost respondsToSelector:@selector(localizedName)])
- return base::SysNSStringToUTF8([myHost localizedName]);
-
- // Fallback for 10.5
- scoped_nsobject<NSString> computerName(base::mac::CFToNSCast(
- SCDynamicStoreCopyComputerName(NULL, NULL)));
- if (computerName.get() != NULL)
- return base::SysNSStringToUTF8(computerName.get());
-
- // If all else fails, return to using a slightly nicer version of the
- // hardware model.
- char modelBuffer[256];
- size_t length = sizeof(modelBuffer);
- if (!sysctlbyname("hw.model", modelBuffer, &length, NULL, 0)) {
- for (size_t i = 0; i < length; i++) {
- if (IsAsciiDigit(modelBuffer[i]))
- return std::string(modelBuffer, 0, i);
- }
- return std::string(modelBuffer, 0, length);
- }
- return "Unknown";
+ return base::SysNSStringToUTF8([myHost localizedName]);
}
} // namespace internal