Update feedback attach file label.

- String change: "Attach this file:" -> "Include this file:"
- Renamed "attach-file-custom-label" to "attach-file-label"
- And always show it for both attaching file cases;
- Make attach file note align with other "Include..." input;
- Move attaching file before system info;

BUG=221589

Review URL: https://chromiumcodereview.appspot.com/13094008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190883 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 34 insertions, 25 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 7fcd04f..9ceae84 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7955,7 +7955,7 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
         Note: You can attach one file per feedback report (3 MB limit)
       </message>
       <message name="IDS_FEEDBACK_ATTACH_FILE_LABEL" desc="Text for the label for the attached filename">
-        Attach this file:
+        Include this file:
       </message>
       <message name="IDS_FEEDBACK_READING_FILE" desc="Text to display if reading a file when the user clicks the send report button">
         Reading file..
diff --git a/chrome/browser/resources/feedback.css b/chrome/browser/resources/feedback.css
index 611701c..9e2a9f2 100644
--- a/chrome/browser/resources/feedback.css
+++ b/chrome/browser/resources/feedback.css
@@ -97,7 +97,14 @@
 }
 
 #attach-file-note {
-  padding: 10px 0 20px
+  -webkit-margin-start: 150px;
+  -webkit-padding-start: 1em;
+  padding-bottom: 20px
+  padding-top: 10px;
+}
+
+#attach-file {
+  margin: 0;
 }
 
 .attach-file-notification {
diff --git a/chrome/browser/resources/feedback.html b/chrome/browser/resources/feedback.html
index 919ce6e..6eceee0 100644
--- a/chrome/browser/resources/feedback.html
+++ b/chrome/browser/resources/feedback.html
@@ -37,6 +37,30 @@
       <input id="user-email-text">
     </div>
 <if expr="pp_ifdef('chromeos')">
+    <!-- Attach a file -->
+    <!-- Normal -->
+    <div id="attach-file-container" class="input-text-container checkbox">
+      <label>
+        <input id="attach-file-checkbox" type="checkbox">
+        <span i18n-content="attach-file-label"></span>
+      </label>
+      <input id="attach-file" type="file">
+      <div id="attach-error" class="attach-file-notification"
+          i18n-content="attach-file-to-big" hidden></div>
+      <div id="reading-file" class="attach-file-notification"
+          i18n-content="reading-file" hidden></div>
+    </div>
+    <!-- Custom -->
+    <div id="attach-file-custom-container" class="input-text-container checkbox"
+      hidden>
+      <label>
+        <input id="attach-file-custom-checkbox" type="checkbox">
+        <span i18n-content="attach-file-label"></span>
+      </label>
+      <span id="attach-file-custom-name" ></span>
+    </div>
+    <div id="attach-file-note" i18n-values=".innerHTML:attach-file-note"></div>
+
     <!-- System Information -->
     <div class="checkbox">
       <label>
@@ -71,28 +95,6 @@
 </if>
       <div id="current-screenshots" class="thumbnail-list"></div>
     </div>
-<if expr="pp_ifdef('chromeos')">
-    <!-- Attach a file -->
-    <!-- Normal -->
-    <div id="attach-file-container">
-      <input id="attach-file-checkbox" type="checkbox">
-      <input id="attach-file" type="file">
-      <div id="attach-error" class="attach-file-notification"
-          i18n-content="attach-file-to-big" hidden></div>
-      <div id="reading-file" class="attach-file-notification"
-          i18n-content="reading-file" hidden></div>
-    </div>
-    <!-- Custom -->
-    <div id="attach-file-custom-container" class="input-text-container checkbox"
-      hidden>
-      <label id="attach-file-container-label">
-        <input id="attach-file-custom-checkbox" type="checkbox">
-        <span i18n-content="attach-file-custom-label"></span>
-      </label>
-      <span id="attach-file-custom-name" ></span>
-    </div>
-    <div id="attach-file-note" i18n-values=".innerHTML:attach-file-note"></div>
-</if>
     <div id="privacy-note" i18n-values=".innerHTML:privacy-note"></div>
     <!-- Buttons -->
     <div id="buttons-pane">
diff --git a/chrome/browser/ui/webui/feedback_ui.cc b/chrome/browser/ui/webui/feedback_ui.cc
index c3a21c4..373ce49 100644
--- a/chrome/browser/ui/webui/feedback_ui.cc
+++ b/chrome/browser/ui/webui/feedback_ui.cc
@@ -318,7 +318,7 @@ content::WebUIDataSource* CreateFeedbackUIHTMLSource(bool successful_init) {
                              IDS_FEEDBACK_CHOOSE_DIFFERENT_SCREENSHOT);
   source->AddLocalizedString("choose-original-screenshot",
                              IDS_FEEDBACK_CHOOSE_ORIGINAL_SCREENSHOT);
-  source->AddLocalizedString("attach-file-custom-label",
+  source->AddLocalizedString("attach-file-label",
                              IDS_FEEDBACK_ATTACH_FILE_LABEL);
   source->AddLocalizedString("attach-file-note",
                              IDS_FEEDBACK_ATTACH_FILE_NOTE);