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

chrome/browser/cocoa/bug_report_window_controller.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/cocoa/bug_report_window_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bug_report_util.h"
@@ skipping 45 matching lines @@
               l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_PAGE_LOOKS_ODD),
               l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_PHISHING_PAGE),
               l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_CANT_SIGN_IN),
               nil]
           atIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, 4)]];
 
       [self setPageURL:base::SysUTF8ToNSString(
           currentTab_->controller().GetActiveEntry()->url().spec())];
       [self setPageTitle:base::SysUTF16ToNSString(currentTab_->GetTitle())];
       mac_util::GrabWindowSnapshot(
-          currentTab_->view()->GetTopLevelNativeWindow(), &pngData_);
+          currentTab_->view()->GetTopLevelNativeWindow(), &pngData_,
+          &pngWidth_, &pngHeight_);
     } else {
       // If no current tab exists, create a menu without the "broken page"
       // options, with page URL and title empty, and screenshot disabled.
       [self setSendScreenshot:NO];
       [self setDisableScreenshotCheckbox:YES];
     }
+
+    pngHeight_ = 0;
+    pngWidth_ = 0;
   }
   return self;
 }
 
 - (void)dealloc {
   [pageURL_ release];
   [pageTitle_ release];
   [bugDescription_ release];
   [bugTypeList_ release];
   [bugTypeDictionary_ release];
@@ skipping 22 matching lines @@
         pageURL_ ? base::SysNSStringToUTF8(pageURL_) : "");
   } else {
     BugReportUtil::SendReport(
         profile_,
         base::SysNSStringToUTF8(pageTitle_),
         [self bugTypeFromIndex],
         base::SysNSStringToUTF8(pageURL_),
         base::SysNSStringToUTF8(bugDescription_),
         sendScreenshot_ && !pngData_.empty() ?
             reinterpret_cast<const char *>(&(pngData_[0])) : NULL,
-        pngData_.size());
+        pngData_.size(), pngWidth_, pngHeight_);
   }
   [self closeDialog];
 }
 
 - (IBAction)cancel:(id)sender {
   [self closeDialog];
 }
 
 - (BOOL)isPhishingReport {
   return [self bugTypeFromIndex] == BugReportUtil::PHISHING_PAGE;
@@ skipping 92 matching lines @@
 + (NSSet*)keyPathsForValuesAffectingValueForKey:(NSString*)key {
   NSSet* paths = [super keyPathsForValuesAffectingValueForKey:key];
   if ([key isEqualToString:@"isPhishingReport"]) {
     paths = [paths setByAddingObject:@"bugTypeIndex"];
   }
   return paths;
 }
 
 @end