Set user-visible machine names and devices types for synced sessions.

chrome/browser/sync/glue/session_model_associator_mac.mm

Index: chrome/browser/sync/glue/session_model_associator_mac.mm
diff --git a/chrome/browser/sync/glue/session_model_associator_mac.mm b/chrome/browser/sync/glue/session_model_associator_mac.mm
new file mode 100644
index 0000000000000000000000000000000000000000..9569ece6caa199a256cd434c057b88388aa07ae1
--- /dev/null
+++ b/chrome/browser/sync/glue/session_model_associator_mac.mm
@@ -0,0 +1,52 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/sync/glue/session_model_associator.h"
+
+#import <Foundation/Foundation.h>
+#import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
+#include <sys/sysctl.h>  // sysctlbyname()
+
+#include "base/mac/mac_util.h"
+#include "base/string_util.h"
+#include "base/sys_info.h"
+#include "base/sys_string_conversions.h"
+
+@interface NSHost(SnowLeopardAPI)
+- (NSString *)localizedName;

[Nico, 2011/09/01 20:20:41]

No space after *

[Yaron, 2011/09/01 22:19:46]

Done. Or did you mean to add a space after the ")"

+@end
+
+namespace browser_sync {
+
+// Static
+std::string SessionModelAssociator::GetHardwareModelName() {
+  NSHost* myHost = [NSHost currentHost];
+  if ([myHost respondsToSelector:@selector(localizedName)]) {
+    return base::SysNSStringToUTF8([myHost localizedName]);
+  } else {

[Nico, 2011/09/01 20:20:41]

No else after return, that makes the function less indented

[Yaron, 2011/09/01 22:19:46]

Done.

+    // Fallback for 10.5
+    NSString* computerName = (NSString *)SCDynamicStoreCopyComputerName(

[Nico, 2011/09/01 20:20:41]

No space in front of *. Also, we don't like C-style casts, you can use the
CFToNSCast() function from base/mac/foundation_util.h.

Also, the docs say you need to release computer_name, so put computerName into a
scoped_nsobject

[Yaron, 2011/09/01 22:19:46]

Done.

+        NULL, NULL);
+    if (computerName != NULL) {
+      return base::SysNSStringToUTF8([myHost localizedName]);

[Nico, 2011/09/01 20:20:41]

s/\[myHost localizedName\]/computerName/ :-)

[Yaron, 2011/09/01 22:19:46]

Done. Ugh.

+    }
+
+    // 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);
+    } else {

[Nico, 2011/09/01 20:20:41]

No else after return

[Yaron, 2011/09/01 22:19:46]

Done.

+      return "Unknown";
+    }
+  }
+}
+
+}  // namespace browser_sync