Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1005)

Unified Diff: chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

Issue 2217163003: Clean up and modernize the feedback code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Actual Fix Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/feedback/feedback_common.h » ('j') | components/feedback/feedback_common.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
index b9fedd12dd6ad34635d4a6f04569d4ceb86ede31..8ab8fa907c54c8a008fa06c3fdfebb808eaf96c2 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
@@ -238,18 +238,6 @@ bool FeedbackPrivateSendFeedbackFunction::RunAsync() {
const FeedbackInfo &feedback_info = params->feedback;
- std::string attached_file_uuid;
- if (feedback_info.attached_file_blob_uuid &&
- !feedback_info.attached_file_blob_uuid->empty()) {
- attached_file_uuid = *feedback_info.attached_file_blob_uuid;
- }
-
- std::string screenshot_uuid;
- if (feedback_info.screenshot_blob_uuid &&
- !feedback_info.screenshot_blob_uuid->empty()) {
- screenshot_uuid = *feedback_info.screenshot_blob_uuid;
- }
-
// Populate feedback data.
scoped_refptr<FeedbackData> feedback_data(new FeedbackData());
feedback_data->set_context(GetProfile());
@@ -263,18 +251,20 @@ bool FeedbackPrivateSendFeedbackFunction::RunAsync() {
feedback_data->set_page_url(*feedback_info.page_url);
if (feedback_info.email)
feedback_data->set_user_email(*feedback_info.email);
+ if (feedback_info.trace_id)
+ feedback_data->set_trace_id(*feedback_info.trace_id);
- if (!attached_file_uuid.empty()) {
+ if (feedback_info.attached_file_blob_uuid &&
+ !feedback_info.attached_file_blob_uuid->empty()) {
feedback_data->set_attached_filename(
StripFakepath((*feedback_info.attached_file).name));
- feedback_data->set_attached_file_uuid(attached_file_uuid);
+ feedback_data->set_attached_file_uuid(
+ *feedback_info.attached_file_blob_uuid);
}
- if (!screenshot_uuid.empty())
- feedback_data->set_screenshot_uuid(screenshot_uuid);
-
- if (feedback_info.trace_id) {
- feedback_data->set_trace_id(*feedback_info.trace_id);
+ if (feedback_info.screenshot_blob_uuid &&
+ !feedback_info.screenshot_blob_uuid->empty()) {
+ feedback_data->set_screenshot_uuid(*feedback_info.screenshot_blob_uuid);
}
std::unique_ptr<FeedbackData::SystemLogsMap> sys_logs(
« no previous file with comments | « no previous file | components/feedback/feedback_common.h » ('j') | components/feedback/feedback_common.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698