Replace IDR_WEB_UI_CLOSE* with IDR_CLOSE_DIALOG*, cleanup, etc.

ui/views/controls/button/label_button.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 "ui/views/controls/button/label_button.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 101 matching lines @@
 void LabelButton::SetDefaultButton(bool default_button) {
   if (default_button == default_button_)
     return;
   default_button_ = default_button;
   ui::Accelerator accel(ui::VKEY_RETURN, ui::EF_NONE);
   default_button_ ? AddAccelerator(accel) : RemoveAccelerator(accel);
 }
 
 void LabelButton::SetNativeTheme(bool native_theme) {
   native_theme_ = native_theme;
-  static_cast<LabelButtonBorder*>(border())->set_native_theme(native_theme);
+  LabelButtonBorder* border = new LabelButtonBorder();
+  border->set_native_theme(native_theme);
+  set_border(border);
   // Invalidate the layout to pickup the new insets from the border.
   InvalidateLayout();
   ResetColorsFromNativeTheme();
 }
 
 gfx::Size LabelButton::GetPreferredSize() {
   // Resize multi-line labels paired with images to use their available width.
   const gfx::Size image_size(image_->GetPreferredSize());
   if (GetTextMultiLine() && !image_size.IsEmpty() && !GetText().empty() &&
       GetHorizontalAlignment() == gfx::ALIGN_CENTER) {
@@ skipping 58 matching lines @@
 
   gfx::Size image_size(image_->GetPreferredSize());
   image_size.set_width(std::min(image_size.width(), child_area.width()));
   image_size.set_height(std::min(image_size.height(), child_area.height()));
 
   // The label takes any remaining width after sizing the image, unless both
   // views are centered. In that case, using the tighter preferred label width
   // avoids wasted space within the label that would look like awkward padding.
   gfx::Size label_size(child_area.size());
   if (!image_size.IsEmpty() && !label_size.IsEmpty()) {
-    label_size.set_width(child_area.width() - image_size.width() - kSpacing);
+    label_size.set_width(
+        std::max(child_area.width() - image_size.width() - kSpacing, 0));
     if (GetHorizontalAlignment() == gfx::ALIGN_CENTER) {
       // Ensure multi-line labels paired with images use their available width.
       if (GetTextMultiLine())
         label_->SizeToFit(label_size.width());
       label_size.set_width(
           std::min(label_size.width(), label_->GetPreferredSize().width()));
     }
   }
 
   gfx::Point image_origin(child_area.origin());
@@ skipping 74 matching lines @@
   params->button.indeterminate = false;
   params->button.is_default = default_button();
   params->button.is_focused = HasFocus() && IsAccessibilityFocusable();
   params->button.has_border = native_theme();
   params->button.classic_state = 0;
   params->button.background_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextButtonBackgroundColor);
 }
 
 }  // namespace views