Add reload button.

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 "base/metrics/histogram.h"
 #include "base/utf_string_conversions.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/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 "views/controls/button/text_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "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);
@@ skipping 23 matching lines @@
   UMA_HISTOGRAM_COUNTS("SadTab.Created", kind_);
 
   // Set the background color.
   set_background(views::Background::CreateSolidBackground(
       (kind_ == CRASHED) ? kCrashColor : kKillColor));
 }
 
 SadTabView::~SadTabView() {}
 
 void SadTabView::LinkClicked(views::Link* source, int event_flags) {
-  if (tab_contents_ != NULL && source == help_link_) {
+  if (tab_contents_ == NULL)

[Peter Kasting, 2011/11/21 21:31:06]

Honestly, can we ever create a SadTabView() with a NULL TabContents*?  If not we
can DCHECK that in the constructor and eliminate any other conditionals or
DCHECKs.

[kevers, 2011/11/22 13:52:02]

Done.

+    return;
+  if (source == help_link_) {
     GURL help_url =
         google_util::AppendGoogleLocaleParam(GURL(kind_ == CRASHED ?
                                                   chrome::kCrashReasonURL :
                                                   chrome::kKillReasonURL));
-    tab_contents_->OpenURL(
-        help_url, GURL(), CURRENT_TAB, content::PAGE_TRANSITION_LINK);

[kevers, 2011/11/21 17:42:49]

This version of OpenURL has been deprecated.  Since I was in the neighborhood, I
updated the call.

-  } else if (tab_contents_ != NULL && source == feedback_link_) {
+    tab_contents_->OpenURL(OpenURLParams(
+        help_url,
+        GURL(),
+        CURRENT_TAB,
+        content::PAGE_TRANSITION_LINK,
+        false /* is renderer initiated */));
+  } else if (source == feedback_link_) {
     browser::ShowHtmlBugReportView(
         Browser::GetBrowserForController(&tab_contents_->controller(), NULL),
         l10n_util::GetStringUTF8(IDS_KILLED_TAB_FEEDBACK_MESSAGE),
         userfeedback::ChromeOsData_ChromeOsCategory_CRASH);
   }
 }
 
+void SadTabView::ButtonPressed(
+    views::Button* source,

[Peter Kasting, 2011/11/21 21:31:06]

Nit: Move to previous line, align next arg

[kevers, 2011/11/22 13:52:02]

Done.

+    const views::Event& event) {
+  if (tab_contents_ == NULL)

[Peter Kasting, 2011/11/21 21:31:06]

Nit: We only add the reload button if |tab_contents_| is non-NULL, so this
function should be:

  DCHECK(tab_contents_);
  DCHECK(source == reload_button_);
  tab_contents_->controller().Reload(true);

[kevers, 2011/11/22 13:52:02]

Done.

+    return;
+  if (source == reload_button_)
+    tab_contents_->controller().Reload(true);
+}
+
 void SadTabView::Layout() {
   // Specify the maximum message width explicitly.
   message_->SizeToFit(static_cast<int>(width() * kMessageSize));
   View::Layout();
 }
 
 void SadTabView::ViewHierarchyChanged(bool is_add,
                                       views::View* parent,
                                       views::View* child) {
   if (child != this || !is_add)
@@ skipping 21 matching lines @@
   layout->StartRowWithPadding(0, column_set_id, 0, kPadding);
   layout->AddView(title);
 
   message_ = CreateLabel(l10n_util::GetStringUTF16(
       (kind_ == CRASHED) ? IDS_SAD_TAB_MESSAGE : IDS_KILLED_TAB_MESSAGE));
   message_->SetMultiLine(true);
   layout->StartRowWithPadding(0, column_set_id, 0, kPadding);
   layout->AddView(message_);
 
   if (tab_contents_) {
+    layout->StartRowWithPadding(0, column_set_id, 0, kPadding);
+    reload_button_ = CreateButton(

[Peter Kasting, 2011/11/21 21:31:06]

Nit: Since this function is only called once, inline it here.

[kevers, 2011/11/22 13:52:02]

Done.

+        l10n_util::GetStringUTF16(IDS_SAD_TAB_RELOAD_LABEL));
+     layout->AddView(reload_button_);
+
     help_link_ = CreateLink(l10n_util::GetStringUTF16(
         (kind_ == CRASHED) ? IDS_SAD_TAB_HELP_LINK : IDS_LEARN_MORE));
 
     if (kind_ == CRASHED) {
       size_t offset = 0;
       string16 help_text(l10n_util::GetStringFUTF16(IDS_SAD_TAB_HELP_MESSAGE,
                                                     string16(), &offset));
       views::Label* help_prefix = CreateLabel(help_text.substr(0, offset));
       views::Label* help_suffix = CreateLabel(help_text.substr(offset));
 
@@ skipping 41 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;
 }
+
+views::TextButton* SadTabView::CreateButton(const string16& text) {
+  views::TextButton* button = new views::TextButton(this, text);
+  button->set_border(new views::TextButtonNativeThemeBorder(button));
+  return button;
+}
+