Added final issue categories to feedback dialog for ChromeOS.

BUG=chromium-os:3564
TEST=open the feedback/bug report dialog, check the new values in the dropdown

Review URL: http://codereview.chromium.org/2553002

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

4 files changed, 41 insertions, 57 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index c6ba033..a59e90c 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4169,35 +4169,23 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Bug type:
       </message>
       <if expr="pp_ifdef('chromeos')">
-        <message name="IDS_BUGREPORT_PAGE_FORMATTING" desc="Report a bug/problem type: Page formatting or layout">
-          Page formatting or layout
-        </message>
-        <message name="IDS_BUGREPORT_PLUGIN_ISSUE" desc="Report a bug/problem type: Plug-ins (e.g. Adobe Flash Player, Quicktime, etc)">
-          Plug-ins (e.g. Adobe Flash Player, Quicktime, etc)
-        </message>
-        <message name="IDS_BUGREPORT_TABS_WINDOW_OVERVIEW_ISSUE" desc="Report a bug/problem type: Tabs, windows or overview mode">
-          Tabs, windows or overview mode
+        <message name="IDS_BUGREPORT_CONNECTIVITY_ISSUE" desc="Report a bug/problem type: Connectivity">
+          Connectivity
         </message>
-        <message name="IDS_BUGREPORT_CONNECTION_ISSUE" desc="Report a bug/problem type: Network connection">
-          Network connection
-        </message>
-        <message name="IDS_BUGREPORT_SYNC_ISSUE" desc="Report a bug/problem type: Network connection">
-          Synced preferences
+        <message name="IDS_BUGREPORT_SYNC_ISSUE" desc="Report a bug/problem type: Sync">
+          Sync
         </message>
-        <message name="IDS_BUGREPORT_CRASH_ISSUE" desc="Report a bug/problem type: Crash">
-          Crash
+        <message name="IDS_BUGREPORT_PAGE_FORMATTING" desc="Report a bug/problem type: Page formatting or layout">
+          Page formatting
         </message>
         <message name="IDS_BUGREPORT_EXTENSION_ISSUE" desc="Report a bug/problem type: Extensions or apps">
           Extensions or apps
         </message>
-        <message name="IDS_BUGREPORT_APP_LAUNCHER_ISSUE" desc="Report a bug/problem type: App launcher">
-          App launcher
-        </message>
-        <message name="IDS_BUGREPORT_PANEL_ISSUE" desc="Report a bug/problem type: Panels">
-          Panels
+        <message name="IDS_BUGREPORT_SUSPEND_ISSUE" desc="Report a bug/problem type: Suspend or resume">
+          Suspend or resume
         </message>
-        <message name="IDS_BUGREPORT_POWER_ISSUE" desc="Report a bug/problem type: Power (battery, standby, etc)">
-          Power (battery, standby, etc)
+        <message name="IDS_BUGREPORT_CRASH_ISSUE" desc="Report a bug/problem type: Crash">
+          Crash
         </message>
       </if>
       <if expr="not pp_ifdef('use_titlecase')">
@@ -4225,8 +4213,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_BUGREPORT_BROWSER_CRASH" desc="Report a bug/problem type: Browser crashed">
           Browser crash... go boom
         </message>
-        <message name="IDS_BUGREPORT_OTHER_PROBLEM" desc="Report a bug/problem type: Other problem">
-          Other problem
+        <message name="IDS_BUGREPORT_OTHER_PROBLEM" desc="Report a bug/problem type: General feedback/other">
+          General feedback/other
         </message>
       </if>
       <if expr="pp_ifdef('use_titlecase')">
@@ -4254,8 +4242,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_BUGREPORT_BROWSER_CRASH" desc="In Title Case: Report a bug/problem type: Browser crashed">
           Browser Crash... Go Boom
         </message>
-        <message name="IDS_BUGREPORT_OTHER_PROBLEM" desc="In Title Case: Report a bug/problem type: Other problem">
-          Other Problem
+        <message name="IDS_BUGREPORT_OTHER_PROBLEM" desc="In Title Case: Report a bug/problem type: General feedback/other">
+          General feedback/other
         </message>
       </if>
 
diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc
index 5f6278e..844abfe 100644
--- a/chrome/browser/bug_report_util.cc
+++ b/chrome/browser/bug_report_util.cc
@@ -36,6 +36,7 @@ const char* const kPngMimeType = "image/png";
 
 // Tags we use in product specific data
 const char* const kPageTitleTag = "PAGE TITLE";
+const char* const kProblemTypeIdTag = "PROBLEM TYPE ID";
 const char* const kProblemTypeTag = "PROBLEM TYPE";
 const char* const kChromeVersionTag = "CHROME VERSION";
 const char* const kOsVersionTag = "OS VERSION";
@@ -130,6 +131,7 @@ void BugReportUtil::SendReport(Profile* profile,
     int png_width,
 #if defined(OS_CHROMEOS)
     int png_height,
+    const std::string& problem_type_text,
     const chromeos::LogDictionaryType* const sys_info) {
 #else
     int png_height) {
@@ -154,9 +156,14 @@ void BugReportUtil::SendReport(Profile* profile,
   AddFeedbackData(&feedback_data, std::string(kPageTitleTag),
                   page_title_text);
 
-  AddFeedbackData(&feedback_data, std::string(kProblemTypeTag),
+  AddFeedbackData(&feedback_data, std::string(kProblemTypeIdTag),
                   StringPrintf("%d\r\n", problem_type));
 
+#if defined(OS_CHROMEOS)
+  AddFeedbackData(&feedback_data, std::string(kProblemTypeTag),
+                  problem_type_text);
+#endif
+
   // Add the user e-mail to the feedback object
   common_data->set_user_email(user_email_text);
 
@@ -190,9 +197,11 @@ void BugReportUtil::SendReport(Profile* profile,
   AddFeedbackData(&feedback_data, std::string(kOsVersionTag), os_version);
 
 #if defined(OS_CHROMEOS)
-  for (chromeos::LogDictionaryType::const_iterator i = sys_info->begin();
-       i != sys_info->end(); ++i)
-    AddFeedbackData(&feedback_data, i->first, i->second);
+  if (sys_info) {
+    for (chromeos::LogDictionaryType::const_iterator i = sys_info->begin();
+         i != sys_info->end(); ++i)
+      AddFeedbackData(&feedback_data, i->first, i->second);
+  }
 #endif
 
   // Include the page image if we have one.
diff --git a/chrome/browser/bug_report_util.h b/chrome/browser/bug_report_util.h
index 4d8ecbd..b7a6580 100644
--- a/chrome/browser/bug_report_util.h
+++ b/chrome/browser/bug_report_util.h
@@ -31,18 +31,13 @@ class BugReportUtil {
  public:
 #if defined(OS_CHROMEOS)
   enum BugType {
-    PAGE_FORMATTING = 0,
-    PAGE_WONT_LOAD,
-    PHISHING_PAGE,
-    PLUGIN_ISSUE,
-    TABS_WINDOW_OVERVIEW_ISSUE,
-    CONNECTION_ISSUE,
+    CONNECTIVITY_ISSUE = 0,
     SYNC_ISSUE,
     CRASH_ISSUE,
+    PAGE_FORMATTING,
     EXTENSION_ISSUE,
-    APP_LAUNCHER_ISSUE,
-    PANEL_ISSUE,
-    POWER_ISSUE,
+    SUSPEND_ISSUE,
+    PHISHING_PAGE,
     OTHER_PROBLEM
   };
 #else
@@ -81,6 +76,7 @@ class BugReportUtil {
       int png_width,
 #if defined(OS_CHROMEOS)
       int png_height,
+      const std::string& problem_type_text,
       const chromeos::LogDictionaryType* const sys_info);
 #else
       int png_height);
diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc
index bef3c21..3d2679a 100644
--- a/chrome/browser/views/bug_report_view.cc
+++ b/chrome/browser/views/bug_report_view.cc
@@ -78,30 +78,20 @@ class BugReportComboBoxModel : public ComboboxModel {
   static std::wstring GetItemAtIndex(int index) {
 #if defined(OS_CHROMEOS)
     switch (index) {
-      case BugReportUtil::PAGE_FORMATTING:
-        return l10n_util::GetString(IDS_BUGREPORT_PAGE_FORMATTING);
-      case BugReportUtil::PAGE_WONT_LOAD:
-        return l10n_util::GetString(IDS_BUGREPORT_PAGE_WONT_LOAD);
-      case BugReportUtil::PHISHING_PAGE:
-        return l10n_util::GetString(IDS_BUGREPORT_PHISHING_PAGE);
-      case BugReportUtil::PLUGIN_ISSUE:
-        return l10n_util::GetString(IDS_BUGREPORT_PLUGIN_ISSUE);
-      case BugReportUtil::TABS_WINDOW_OVERVIEW_ISSUE:
-        return l10n_util::GetString(IDS_BUGREPORT_TABS_WINDOW_OVERVIEW_ISSUE);
-      case BugReportUtil::CONNECTION_ISSUE:
-        return l10n_util::GetString(IDS_BUGREPORT_CONNECTION_ISSUE);
+      case BugReportUtil::CONNECTIVITY_ISSUE:
+        return l10n_util::GetString(IDS_BUGREPORT_CONNECTIVITY_ISSUE);
       case BugReportUtil::SYNC_ISSUE:
         return l10n_util::GetString(IDS_BUGREPORT_SYNC_ISSUE);
       case BugReportUtil::CRASH_ISSUE:
         return l10n_util::GetString(IDS_BUGREPORT_CRASH_ISSUE);
+      case BugReportUtil::PAGE_FORMATTING:
+        return l10n_util::GetString(IDS_BUGREPORT_PAGE_FORMATTING);
       case BugReportUtil::EXTENSION_ISSUE:
         return l10n_util::GetString(IDS_BUGREPORT_EXTENSION_ISSUE);
-      case BugReportUtil::APP_LAUNCHER_ISSUE:
-        return l10n_util::GetString(IDS_BUGREPORT_APP_LAUNCHER_ISSUE);
-      case BugReportUtil::PANEL_ISSUE:
-        return l10n_util::GetString(IDS_BUGREPORT_PANEL_ISSUE);
-      case BugReportUtil::POWER_ISSUE:
-        return l10n_util::GetString(IDS_BUGREPORT_POWER_ISSUE);
+      case BugReportUtil::SUSPEND_ISSUE:
+        return l10n_util::GetString(IDS_BUGREPORT_SUSPEND_ISSUE);
+      case BugReportUtil::PHISHING_PAGE:
+        return l10n_util::GetString(IDS_BUGREPORT_PHISHING_PAGE);
       case BugReportUtil::OTHER_PROBLEM:
         return l10n_util::GetString(IDS_BUGREPORT_OTHER_PROBLEM);
       default:
@@ -602,6 +592,7 @@ bool BugReportView::Accept() {
           UTF16ToUTF8(description_text_->text()),
           image_data, image_data_size,
           screen_size_.width(), screen_size_.height(),
+          WideToUTF8(bug_type_combo_->model()->GetItemAt(problem_type_)),
           sys_info_.get());
 #else
       BugReportUtil::SendReport(profile_,