| Index: chrome/browser/feedback/feedback_data.h
|
| diff --git a/chrome/browser/feedback/feedback_data.h b/chrome/browser/feedback/feedback_data.h
|
| index c13405aeafdcf0d33602b9888aa71408353f8977..14217cca825eb28516299323a005fce7a7d05980 100644
|
| --- a/chrome/browser/feedback/feedback_data.h
|
| +++ b/chrome/browser/feedback/feedback_data.h
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "chrome/browser/ui/webui/screenshot_source.h"
|
| +#include "googleurl/src/gurl.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/chromeos/system_logs/system_logs_fetcher.h"
|
| @@ -60,13 +61,15 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
|
| const std::string& description() const { return description_; }
|
| const std::string& user_email() const { return user_email_; }
|
| ScreenshotDataPtr image() const { return image_; }
|
| + const std::string attached_filename() const { return attached_filename_; }
|
| + const GURL attached_file_url() const { return attached_file_url_; }
|
| + std::string* attached_filedata() const { return attached_filedata_.get(); }
|
| + const GURL screenshot_url() const { return screenshot_url_; }
|
| #if defined(OS_CHROMEOS)
|
| chromeos::SystemLogsResponse* sys_info() const {
|
| return send_sys_info_ ? sys_info_.get() : NULL;
|
| }
|
| const std::string timestamp() const { return timestamp_; }
|
| - const std::string attached_filename() const { return attached_filename_; }
|
| - std::string* attached_filedata() const { return attached_filedata_.get(); }
|
| std::string* compressed_logs() const { return compressed_logs_.get(); }
|
| #endif
|
|
|
| @@ -83,17 +86,20 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
|
| user_email_ = user_email;
|
| }
|
| void set_image(ScreenshotDataPtr image) { image_ = image; }
|
| -#if defined(OS_CHROMEOS)
|
| - void set_send_sys_info(bool send_sys_info) { send_sys_info_ = send_sys_info; }
|
| - void set_timestamp(const std::string& timestamp) {
|
| - timestamp_ = timestamp;
|
| - }
|
| void set_attached_filename(const std::string& attached_filename) {
|
| attached_filename_ = attached_filename;
|
| }
|
| void set_attached_filedata(scoped_ptr<std::string> attached_filedata) {
|
| attached_filedata_ = attached_filedata.Pass();
|
| }
|
| + void set_attached_file_url(const GURL& url) { attached_file_url_ = url; }
|
| + void set_screenshot_url(const GURL& url) { screenshot_url_ = url; }
|
| +#if defined(OS_CHROMEOS)
|
| + void set_sys_info(scoped_ptr<chromeos::SystemLogsResponse> sys_info);
|
| + void set_send_sys_info(bool send_sys_info) { send_sys_info_ = send_sys_info; }
|
| + void set_timestamp(const std::string& timestamp) {
|
| + timestamp_ = timestamp;
|
| + }
|
| #endif
|
|
|
| private:
|
| @@ -112,6 +118,11 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
|
| std::string description_;
|
| std::string user_email_;
|
| ScreenshotDataPtr image_;
|
| + std::string attached_filename_;
|
| + scoped_ptr<std::string> attached_filedata_;
|
| +
|
| + GURL attached_file_url_;
|
| + GURL screenshot_url_;
|
|
|
| #if defined(OS_CHROMEOS)
|
| // Chromeos specific values for SendReport. Will be deleted in
|
| @@ -120,8 +131,6 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> {
|
| scoped_ptr<chromeos::SystemLogsResponse> sys_info_;
|
|
|
| std::string timestamp_;
|
| - std::string attached_filename_;
|
| - scoped_ptr<std::string> attached_filedata_;
|
| scoped_ptr<std::string> compressed_logs_;
|
|
|
| // Flag to indicate whether or not we should send the system information
|
|
|