browser/ui: Unify the enum Kind of SadTab used by SadTabViews and SabTabGtk.

chrome/browser/ui/gtk/sad_tab_gtk.cc

 // Copyright (c) 2012 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/gtk/sad_tab_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 34 matching lines @@
 
   // Set text to white.
   GdkColor white = ui::kGdkWhite;
   gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &white);
 
   return label;
 }
 
 }  // namespace
 
-SadTabGtk::SadTabGtk(WebContents* web_contents, Kind kind)
+SadTabGtk::SadTabGtk(WebContents* web_contents, chrome::SadTabKind kind)
     : web_contents_(web_contents),
       kind_(kind) {
   DCHECK(web_contents_);
 
   // Use an event box to get the background painting correctly.
   event_box_.Own(gtk_event_box_new());
   gtk_widget_modify_bg(event_box_.get(), GTK_STATE_NORMAL,
-                       kind == CRASHED ?
-                       &kCrashedBackgroundColor :
-                       &kKilledBackgroundColor);
+      (kind == chrome::SAD_TAB_KIND_CRASHED) ?
+          &kCrashedBackgroundColor : &kKilledBackgroundColor);
   // Allow ourselves to be resized arbitrarily small.
   gtk_widget_set_size_request(event_box_.get(), 0, 0);
 
   GtkWidget* centering = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
   gtk_container_add(GTK_CONTAINER(event_box_.get()), centering);
 
   // Use a vertical box to contain icon, title, message and link.
   GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
   gtk_container_add(GTK_CONTAINER(centering), vbox);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   // Add center-aligned image.
   GtkWidget* image = gtk_image_new_from_pixbuf(rb.GetNativeImageNamed(
-      kind == CRASHED ? IDR_SAD_TAB : IDR_KILLED_TAB).ToGdkPixbuf());
+      (kind == chrome::SAD_TAB_KIND_CRASHED) ?
+          IDR_SAD_TAB : IDR_KILLED_TAB).ToGdkPixbuf());
   gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.5);
   gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
 
   // Add spacer between image and title.
   GtkWidget* spacer = gtk_label_new(NULL);
   gtk_label_set_markup(GTK_LABEL(spacer), "<span size=\"larger\"> </span>");
   gtk_box_pack_start(GTK_BOX(vbox), spacer, FALSE, FALSE, 0);
 
   // Add center-aligned title.
   GtkWidget* title = MakeWhiteMarkupLabel(
       "<span size=\"larger\" style=\"normal\"><b>%s</b></span>",
-      l10n_util::GetStringUTF8(kind == CRASHED ?
-                               IDS_SAD_TAB_TITLE :
-                               IDS_KILLED_TAB_TITLE));
+      l10n_util::GetStringUTF8((kind == chrome::SAD_TAB_KIND_CRASHED) ?
+          IDS_SAD_TAB_TITLE : IDS_KILLED_TAB_TITLE));
   gtk_box_pack_start(GTK_BOX(vbox), title, FALSE, FALSE, 0);
 
   // Add spacer between title and message.
   spacer = gtk_label_new(" ");
   gtk_box_pack_start(GTK_BOX(vbox), spacer, FALSE, FALSE, 0);
 
   // Add center-aligned message.
   GtkWidget* message = MakeWhiteMarkupLabel(
       "<span style=\"normal\">%s</span>",
-      l10n_util::GetStringUTF8(kind == CRASHED ?
-                               IDS_SAD_TAB_MESSAGE :
-                               IDS_KILLED_TAB_MESSAGE));
+      l10n_util::GetStringUTF8((kind == chrome::SAD_TAB_KIND_CRASHED) ?
+          IDS_SAD_TAB_MESSAGE : IDS_KILLED_TAB_MESSAGE));
   gtk_label_set_line_wrap(GTK_LABEL(message), TRUE);
   gtk_box_pack_start(GTK_BOX(vbox), message, FALSE, FALSE, 0);
 
   // Add spacer between message and link.
   spacer = gtk_label_new(" ");
   gtk_box_pack_start(GTK_BOX(vbox), spacer, FALSE, FALSE, 0);
 
-  if (web_contents_ != NULL) {
+  if (web_contents_) {
     // Create the help link and alignment.
     std::string link_text(l10n_util::GetStringUTF8(
-        kind == CRASHED ? IDS_SAD_TAB_HELP_LINK : IDS_LEARN_MORE));
+        (kind == chrome::SAD_TAB_KIND_CRASHED) ?
+            IDS_SAD_TAB_HELP_LINK : IDS_LEARN_MORE));
     GtkWidget* link = gtk_chrome_link_button_new(link_text.c_str());
     gtk_chrome_link_button_set_normal_color(GTK_CHROME_LINK_BUTTON(link),
                                             &ui::kGdkWhite);
     g_signal_connect(link, "clicked", G_CALLBACK(OnLinkButtonClickThunk), this);
     GtkWidget* help_alignment = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
 
-    if (kind == CRASHED) {
+    if (kind == chrome::SAD_TAB_KIND_CRASHED) {
       // Use a horizontal box to contain the help text and link.
       GtkWidget* help_hbox = gtk_hbox_new(FALSE, 0);
       gtk_container_add(GTK_CONTAINER(vbox), help_hbox);
 
       size_t offset = 0;
       string16 help_text(l10n_util::GetStringFUTF16(IDS_SAD_TAB_HELP_MESSAGE,
                                                     string16(), &offset));
       std::string help_prefix_text(UTF16ToUTF8(help_text.substr(0, offset)));
       std::string help_suffix_text(UTF16ToUTF8(help_text.substr(offset)));
 
@@ skipping 16 matching lines @@
   }
 
   gtk_widget_show_all(event_box_.get());
 }
 
 SadTabGtk::~SadTabGtk() {
   event_box_.Destroy();
 }
 
 void SadTabGtk::OnLinkButtonClick(GtkWidget* sender) {
-  if (web_contents_ != NULL) {
-    GURL help_url(
-        kind_ == CRASHED ? chrome::kCrashReasonURL : chrome::kKillReasonURL);
-    OpenURLParams params(
-        help_url, content::Referrer(), CURRENT_TAB,
-        content::PAGE_TRANSITION_LINK, false);
+  if (web_contents_) {
+    GURL help_url((kind_ == chrome::SAD_TAB_KIND_CRASHED) ?
+        chrome::kCrashReasonURL : chrome::kKillReasonURL);
+    OpenURLParams params(help_url, content::Referrer(), CURRENT_TAB,
+                         content::PAGE_TRANSITION_LINK, false);
     web_contents_->OpenURL(params);
   }
 }