Refactor and fix feedback

chrome/browser/ui/views/sad_tab_view.cc

Index: chrome/browser/ui/views/sad_tab_view.cc
diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc
index 1e65bc6f071f10dd9be3e95cae4a6c6cb20dbaaf..02f50892d4a40ea7f6ad9306348e882500558046 100644
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -4,12 +4,14 @@
 
 #include "chrome/browser/ui/views/sad_tab_view.h"
 
+#include <string>
+
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/feedback/feedback_util.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/webui/bug_report_ui.h"
-#include "chrome/browser/userfeedback/proto/extension.pb.h"
+#include "chrome/browser/ui/webui/feedback_ui.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
@@ -29,6 +31,8 @@ static const SkColor kTextColor = SK_ColorWHITE;
 static const SkColor kCrashColor = SkColorSetRGB(35, 48, 64);
 static const SkColor kKillColor = SkColorSetRGB(57, 48, 88);
 
+const char kCategoryTagCrash[] = "Crash";

[xiyuan, 2011/12/22 02:18:23]

"static" if we don't use it outside this file.

[rkc, 2011/12/22 22:41:46]

const = internal linkage, static is not needed.

+
 // Font size correction.
 #if defined(CROS_FONTS_USING_BCI)
 static const int kTitleFontSizeDelta = 1;
@@ -74,10 +78,10 @@ void SadTabView::LinkClicked(views::Link* source, int event_flags) {
         content::PAGE_TRANSITION_LINK,
         false /* is renderer initiated */));
   } else if (source == feedback_link_) {
-    browser::ShowHtmlBugReportView(
+    browser::ShowHtmlFeedbackView(
         Browser::GetBrowserForController(&tab_contents_->controller(), NULL),
         l10n_util::GetStringUTF8(IDS_KILLED_TAB_FEEDBACK_MESSAGE),
-        userfeedback::ChromeOsData_ChromeOsCategory_CRASH);
+        std::string(kCategoryTagCrash));
   }
 }
 
@@ -198,5 +202,3 @@ views::Link* SadTabView::CreateLink(const string16& text) {
   link->set_listener(this);
   return link;
 }
-
-