Refactor and fix feedback

chrome/browser/ui/views/sad_tab_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/layout/grid_layout.h"
 
 static const int kPadding = 20;
 static const float kMessageSize = 0.65f;
 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;
 static const int kMessageFontSizeDelta = 0;
 #else
 static const int kTitleFontSizeDelta = 2;
 static const int kMessageFontSizeDelta = 1;
 #endif
 
 SadTabView::SadTabView(TabContents* tab_contents, Kind kind)
@@ skipping 25 matching lines @@
         google_util::AppendGoogleLocaleParam(GURL(kind_ == CRASHED ?
                                                   chrome::kCrashReasonURL :
                                                   chrome::kKillReasonURL));
     tab_contents_->OpenURL(OpenURLParams(
         help_url,
         content::Referrer(),
         CURRENT_TAB,
         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));
   }
 }
 
 void SadTabView::ButtonPressed(views::Button* source,
                                const views::Event& event) {
   DCHECK(tab_contents_);
   DCHECK(source == reload_button_);
   tab_contents_->controller().Reload(true);
 }
 
@@ skipping 100 matching lines @@
 }
 
 views::Link* SadTabView::CreateLink(const string16& text) {
   views::Link* link = new views::Link(text);
   link->SetFont(base_font_.DeriveFont(kMessageFontSizeDelta));
   link->SetBackgroundColor(background()->get_color());
   link->SetEnabledColor(kTextColor);
   link->set_listener(this);
   return link;
 }
-
-