Commiting http://codereview.chromium.org/2017007/show on behalf of rkc@chromi...

base/mac_util.mm

 // Copyright (c) 2010 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_util.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 226 matching lines @@
   //   return ![defaults objectForKey:@"AppleMiniaturizeOnDoubleClick"] ||
   //          [defaults boolForKey:@"AppleMiniaturizeOnDoubleClick"];
   BOOL methodImplemented =
       [NSWindow respondsToSelector:@selector(_shouldMiniaturizeOnDoubleClick)];
   DCHECK(methodImplemented);
   return !methodImplemented ||
       [NSWindow performSelector:@selector(_shouldMiniaturizeOnDoubleClick)];
 }
 
 void GrabWindowSnapshot(NSWindow* window,
-    std::vector<unsigned char>* png_representation) {
+    std::vector<unsigned char>* png_representation,
+    int* width, int* height) {
   // Make sure to grab the "window frame" view so we get current tab +
   // tabstrip.
   NSView* view = [[window contentView] superview];
   NSBitmapImageRep* rep =
       [view bitmapImageRepForCachingDisplayInRect:[view bounds]];
   [view cacheDisplayInRect:[view bounds] toBitmapImageRep:rep];
   NSData* data = [rep representationUsingType:NSPNGFileType properties:nil];
   const unsigned char* buf = static_cast<const unsigned char*>([data bytes]);
   NSUInteger length = [data length];
   if (buf != NULL && length > 0){
+    *width = static_cast<int>([rep pixelsWide]);
+    *height = static_cast<int>([rep pixelsHigh]);
     png_representation->assign(buf, buf + length);
     DCHECK(png_representation->size() > 0);
   }
 }
 
 void ActivateProcess(pid_t pid) {
   ProcessSerialNumber process;
   OSStatus status = GetProcessForPID(pid, &process);
   if (status == noErr) {
     SetFrontProcess(&process);
@@ skipping 202 matching lines @@
   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;
 }
 
 }  // namespace mac_util