Remove screen dimensions from image sent with Feedback.

chrome/browser/feedback/feedback_data.cc

 // Copyright (c) 2012 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/feedback/feedback_data.h"
 
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
@@ skipping 26 matching lines @@
 // with the report. This method only converts those logs that we want in
 // the compressed zip file sent with the report, hence it ignores any logs
 // below the size threshold of what we want compressed.
 std::string LogsToString(FeedbackData::SystemLogsMap* sys_info) {
   std::string syslogs_string;
   for (FeedbackData::SystemLogsMap::const_iterator it = sys_info->begin();
       it != sys_info->end(); ++it) {
     std::string key = it->first;
     std::string value = it->second;
 
-    // Screensize info is sent with every report to remember the window size
-    // for when feedback was invoked. This is a hack needed to know what
-    // dimensions the user screenshot is since the actual screenshot mechanism
-    // in JS doesn't give us the dimensions of the screenshot taken. These
-    // values shouldn't be sent with the report.
-    if (key == FeedbackData::kScreensizeHeightKey ||
-        key == FeedbackData::kScreensizeWidthKey ||
-        FeedbackData::BelowCompressionThreshold(value))
+    if (FeedbackData::BelowCompressionThreshold(value))
       continue;
 
     TrimString(key, "\n ", &key);
     TrimString(value, "\n ", &value);
 
     if (value.find("\n") != std::string::npos) {
       syslogs_string.append(
           key + "=" + kMultilineIndicatorString +
           kMultilineStartString +
           value + "\n" +
@@ skipping 11 matching lines @@
   std::string logs_string = LogsToString(sys_info);
   if (logs_string.empty() ||
       !feedback_util::ZipString(logs_string, compressed_logs)) {
     compressed_logs->clear();
   }
 }
 
 }  // namespace
 
 // static
-const char FeedbackData::kScreensizeHeightKey[] = "ScreensizeHeight";
-// static
-const char FeedbackData::kScreensizeWidthKey[] = "ScreensizeWidth";
-
-// static
 bool FeedbackData::BelowCompressionThreshold(const std::string& content) {
   if (content.length() > kFeedbackMaxLength)
     return false;
   const size_t line_count = std::count(content.begin(), content.end(), '\n');
   if (line_count > kFeedbackMaxLineCount)
     return false;
   return true;
 }
 
 FeedbackData::FeedbackData() : profile_(NULL),
@@ skipping 69 matching lines @@
       feedback_page_data_complete_;
 }
 
 void FeedbackData::SendReport() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (IsDataComplete() && !report_sent_) {
     report_sent_ = true;
     feedback_util::SendReport(this);
   }
 }