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

base/mac/mac_util.mm

 // 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 "base/mac/mac_util.h"
 
 #import <Cocoa/Cocoa.h>
 #include <string.h>
+#include <sys/sysctl.h>  // sysctlbyname()
 #include <sys/utsname.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/string_number_conversions.h"
+#include "base/string_util.h"
+#include "base/sys_info.h"
 #include "base/sys_string_conversions.h"
 
 namespace base {
 namespace mac {
 
 namespace {
 
 // The current count of outstanding requests for full screen mode from browser
 // windows, plugins, etc.
 int g_full_screen_requests[kNumFullScreenModes] = { 0, 0, 0};
@@ skipping 318 matching lines @@
   // Constant used by WebKit; what exactly it means is unknown.
   const int magic_session_constant = -2;
   OSErr err =
       ls_set_application_information_item_func(magic_session_constant, asn,
                                                ls_display_name_key,
                                                process_name,
                                                NULL /* optional out param */);
   LOG_IF(ERROR, err) << "Call to set process name failed, err " << err;
 }
 
+std::string GetHardwareModelName() {
+  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 {
+    return "Unknown";
+  }

[Nico, 2011/08/31 03:55:50]

Don't you want [[NSHost currentHost] localizedName];?

[Nico, 2011/08/31 03:58:22]

(If so, you'll probably need some kind of fallback on 10.5)

[Yaron, 2011/08/31 23:23:22]

No the thinking was that people identify their computers by the device itself.
So it would be typical for someone to think of it as "oh that's my Macbook Air"
and that the computer name is less meaningful. This would be a slightly worse
experience for users with multiple devices of the same type (which seems rare),
but otherwise seems like a usability win. In a later release, we'll also add the
ability to customize this string which would support that case. Note that based
on Darin's feedback, I've moved this into session_model_associator

[Nico, 2011/08/31 23:27:13]

That string usually looks like "Nico Weber's MacBook" i.e. it includes the name.
But users can change it in sysprefs and it's what mac users expect to see. I'm
pretty sure you want to use the function I mentioned.

[Yaron, 2011/09/01 20:16:17]

Ah, ok, fair enough. Added that for 10.6 and left the existing code as a
fallback.

+}
+
 // Converts a NSImage to a CGImageRef.  Normally, the system frameworks can do
 // this fine, especially on 10.6.  On 10.5, however, CGImage cannot handle
 // converting a PDF-backed NSImage into a CGImageRef.  This function will
 // rasterize the PDF into a bitmap CGImage.  The caller is responsible for
 // releasing the return value.
 CGImageRef CopyNSImageToCGImage(NSImage* image) {
   // This is based loosely on http://www.cocoadev.com/index.pl?CGImageRef .
   NSSize size = [image size];
   ScopedCFTypeRef<CGContextRef> context(
       CGBitmapContextCreate(NULL,  // Allow CG to allocate memory.
@@ skipping 248 matching lines @@
 #endif
 
 #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_7)
 bool IsOSLaterThanLion() {
   return MacOSXMinorVersion() > LION_MINOR_VERSION;
 }
 #endif
 
 }  // namespace mac
 }  // namespace base