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

Side by Side Diff: sync/util/get_session_name_mac.mm

Issue 10807052: mac: Remove code that was only needed on 10.5 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: kill workspaceIDCache_ Created 8 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 | « net/base/cert_verify_proc_unittest.cc ('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) 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 "sync/util/get_session_name_mac.h" 5 #include "sync/util/get_session_name_mac.h"
6 6
7 #import <Foundation/Foundation.h> 7 #import <Foundation/Foundation.h>
8 #import <SystemConfiguration/SCDynamicStoreCopySpecific.h> 8 #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
9 #include <sys/sysctl.h> // sysctlbyname() 9 #include <sys/sysctl.h> // sysctlbyname()
10 10
11 #include "base/mac/foundation_util.h" 11 #include "base/mac/foundation_util.h"
12 #include "base/mac/mac_util.h" 12 #include "base/mac/mac_util.h"
13 #include "base/memory/scoped_nsobject.h" 13 #include "base/memory/scoped_nsobject.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/sys_info.h" 15 #include "base/sys_info.h"
16 #include "base/sys_string_conversions.h" 16 #include "base/sys_string_conversions.h"
17 17
18 @interface NSHost(SnowLeopardAPI)
19 - (NSString*)localizedName;
20 @end
21
22 namespace syncer { 18 namespace syncer {
23 namespace internal { 19 namespace internal {
24 20
25 std::string GetHardwareModelName() { 21 std::string GetHardwareModelName() {
26 NSHost* myHost = [NSHost currentHost]; 22 NSHost* myHost = [NSHost currentHost];
27 if ([myHost respondsToSelector:@selector(localizedName)]) 23 return base::SysNSStringToUTF8([myHost localizedName]);
28 return base::SysNSStringToUTF8([myHost localizedName]);
29
30 // Fallback for 10.5
31 scoped_nsobject<NSString> computerName(base::mac::CFToNSCast(
32 SCDynamicStoreCopyComputerName(NULL, NULL)));
33 if (computerName.get() != NULL)
34 return base::SysNSStringToUTF8(computerName.get());
35
36 // If all else fails, return to using a slightly nicer version of the
37 // hardware model.
38 char modelBuffer[256];
39 size_t length = sizeof(modelBuffer);
40 if (!sysctlbyname("hw.model", modelBuffer, &length, NULL, 0)) {
41 for (size_t i = 0; i < length; i++) {
42 if (IsAsciiDigit(modelBuffer[i]))
43 return std::string(modelBuffer, 0, i);
44 }
45 return std::string(modelBuffer, 0, length);
46 }
47 return "Unknown";
48 } 24 }
49 25
50 } // namespace internal 26 } // namespace internal
51 } // namespace syncer 27 } // namespace syncer
OLDNEW
« no previous file with comments | « net/base/cert_verify_proc_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698