[Md Feedback] Add the rest of existing strings.

This change adds the rest of the strings of the feedback form we'll be using. These strings are copied from the current feedback form; we opt to create new strings in case they're modified in the future, as to not disrupt the current feedback flow.

The remaining missing strings (i.e. for file upload) correspond to components that are not planned for the redesign.

No additional styling work has been done; this will be done when the feedback form is also migrated to a dialog.

BUG=615535
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2163753003
Cr-Commit-Position: refs/heads/master@{#407636}

chrome/app/generated_resources.grd

@@ -7782,6 +7782,25 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_MD_FEEDBACK_SEND_REPORT_BUTTON" desc="Text for Send Report button of the feedback dialog. When clicked, the feedback report will be sent.">
         Send feedback
       </message>
+      <message name="IDS_MD_FEEDBACK_SCREENSHOT_LABEL" desc="Label for the checkbox to indicate whether the shown screenshot should be included in the feedback report.">
+        Include this screenshot:
+      </message>
+      <message name="IDS_MD_FEEDBACK_SEND_SYSTEM_INFO_LABEL" desc="Label for the checkbox to indicate whether the system info should be included in the feedback report.">
+        Send system information
+      </message>
+      <if expr="_google_chrome">
+        <message name="IDS_MD_FEEDBACK_PRIVACY_NOTE" desc="Text for the privacy note shown on the feedback dialog.">
+          Your Chrome and operating system version will be submitted in addition
+          to any information you choose to include above. If you include your email
+          address, Google may contact you regarding your feedback report. This feedback
+          is used to diagnose problems and help improve Chrome. Any personal information
+          you submit, whether explicitly or incidentally will be protected in
+          accordance with our privacy policies.<ph name="BEGIN_BOLD">&lt;strong&gt;
+          </ph> By submitting this feedback, you agree that Google may use feedback
+          that you provide to improve any Google product or service.
+          <ph name="END_BOLD">&lt;/strong&gt;</ph>
+        </message>
+      </if>
 
       <!-- Clear Browsing Data -->
       <message name="IDS_CLEAR_BROWSING_DATA_TITLE" desc="Dialog title">

chrome/browser/resources/md_feedback/feedback_container.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-textarea.html">
 <dom-module name="feedback-container">
@@ -22,6 +23,15 @@
       <paper-input label="$i18n{urlLabel}"></paper-input>
       <paper-input label="$i18n{emailLabel}"></paper-input>
     </div>
+    <div>
+      <paper-checkbox>$i18n{includeScreenshotLabel}</paper-checkbox>
+    </div>
+    <div>
+      <paper-checkbox>$i18n{sendSystemInfoLabel}</paper-checkbox>
+    </div>
+    <div>
+      <span>[[getPrivacyNote_()]]</span>
+    </div>
     <div>
       <paper-button>$i18n{cancelButton}</paper-button>
       <paper-button id="submit-button">$i18n{sendReportButton}</paper-button>

chrome/browser/resources/md_feedback/feedback_container.js

@@ -7,4 +7,15 @@
 // to show and what will be submitted to the feedback servers.
 Polymer({
   is: 'feedback-container',
+
+  /**
+   * Retrieves the feedback privacy note text, if it exists. On non-officially
+   * branded builds, the string is not defined.
+   *
+   * @return {string} Privacy note text.
+   */
+  getPrivacyNote_: function() {
+    return loadTimeData.valueExists('privacyNote') ?
+        this.i18n('privacyNote') : '';
+  },
 });

chrome/browser/ui/webui/md_feedback/md_feedback_ui.cc

@@ -79,6 +79,10 @@ content::WebUIDataSource* CreateMdFeedbackUIHTMLSource(Profile* profile) {
   // General strings.
   html_source->AddLocalizedString("headingText",
                                   IDS_MD_FEEDBACK_HEADING);
+#if defined(GOOGLE_CHROME_BUILD)
+  html_source->AddLocalizedString("privacyNote",
+                                  IDS_MD_FEEDBACK_PRIVACY_NOTE);
+#endif
 
   // Input labels.
   html_source->AddLocalizedString("emailLabel",
@@ -94,6 +98,12 @@ content::WebUIDataSource* CreateMdFeedbackUIHTMLSource(Profile* profile) {
   html_source->AddLocalizedString("sendReportButton",
                                   IDS_MD_FEEDBACK_SEND_REPORT_BUTTON);
 
+  // Checkbox labels.
+  html_source->AddLocalizedString("includeScreenshotLabel",
+                                  IDS_MD_FEEDBACK_SCREENSHOT_LABEL);
+  html_source->AddLocalizedString("sendSystemInfoLabel",
+                                  IDS_MD_FEEDBACK_SEND_SYSTEM_INFO_LABEL);
+
   // Polymer resources.
   html_source->AddResourcePath("feedback_container.html",
         IDR_MD_FEEDBACK_FEEDBACK_CONTAINER_HTML);