Add the user email field to Chrome.

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 "chrome/browser/feedback/feedback_util.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_CHROMEOS)
@@ skipping 13 matching lines @@
 {
 }
 
 FeedbackData::~FeedbackData() {}
 
 void FeedbackData::UpdateData(Profile* profile,
                                const std::string& target_tab_url,
                                const std::string& category_tag,
                                const std::string& page_url,
                                const std::string& description,
+                               const std::string& user_email,
                                ScreenshotDataPtr image
 #if defined(OS_CHROMEOS)
-                               , const std::string& user_email
                                , const bool send_sys_info
                                , const bool sent_report
                                , const std::string& timestamp
 #endif
                                ) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   profile_ = profile;
   target_tab_url_ = target_tab_url;
   category_tag_ = category_tag;
   page_url_ = page_url;
   description_ = description;
+  user_email_ = user_email;
   image_ = image;
 #if defined(OS_CHROMEOS)
-  user_email_ = user_email;
   send_sys_info_ = send_sys_info;
   sent_report_ = sent_report;
   timestamp_ = timestamp;
 #endif
 }
 
 void FeedbackData::SendReport() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 #if defined(OS_CHROMEOS)
   if (sent_report_)
     return;  // We already received the syslogs and sent the report.
 
   // Set send_report_ to ensure that we only send one report.
   sent_report_ = true;
 #endif
 
   gfx::Rect& screen_size = FeedbackUtil::GetScreenshotSize();
   FeedbackUtil::SendReport(profile_
                             , category_tag_
                             , page_url_
                             , description_
+                            , user_email_
                             , image_
                             , screen_size.width()
                             , screen_size.height()
 #if defined(OS_CHROMEOS)
-                            , user_email_
                             , zip_content_ ? zip_content_->c_str() : NULL
                             , zip_content_ ? zip_content_->length() : 0
                             , send_sys_info_ ? sys_info_ : NULL
                             , timestamp_
 #endif
                           );
 
 #if defined(OS_CHROMEOS)
   if (sys_info_) {
     delete sys_info_;
@@ skipping 25 matching lines @@
   } else {
     zip_content_ = zip_content;
     sys_info_ = logs;  // Will get deleted when SendReport() is called.
     if (send_sys_info_) {
       // We already prepared the report, send it now.
       this->SendReport();
     }
   }
 }
 #endif