Make the Clear Browsing Data dialog box look a little nicer.

- Now use GtkCheckButton's own label instead of the hack one used only by windows.
- Render a background for DialogClientView.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/160066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21484 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 10 deletions

diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc
index 0097251..c3ea2ff 100644
--- a/views/controls/button/checkbox.cc
+++ b/views/controls/button/checkbox.cc
@@ -57,6 +57,9 @@ gfx::Size Checkbox::GetPreferredSize() {
     return gfx::Size();
 
   gfx::Size prefsize = native_wrapper_->GetView()->GetPreferredSize();
+  if (native_wrapper_->UsesNativeLabel())
+    return prefsize;
+
   prefsize.set_width(
       prefsize.width() + kCheckboxLabelSpacing +
           kLabelFocusPaddingHorizontal * 2);
@@ -72,16 +75,24 @@ void Checkbox::Layout() {
   if (!native_wrapper_)
     return;
 
-  gfx::Size checkmark_prefsize = native_wrapper_->GetView()->GetPreferredSize();
-  int label_x = checkmark_prefsize.width() + kCheckboxLabelSpacing +
-      kLabelFocusPaddingHorizontal;
-  label_->SetBounds(
-      label_x, 0, std::max(0, width() - label_x - kLabelFocusPaddingHorizontal),
-      height());
-  int first_line_height = label_->GetFont().height();
-  native_wrapper_->GetView()->SetBounds(
-      0, ((first_line_height - checkmark_prefsize.height()) / 2),
-      checkmark_prefsize.width(), checkmark_prefsize.height());
+  if (native_wrapper_->UsesNativeLabel()) {
+    label_->SetBounds(0, 0, 0, 0);
+    label_->SetVisible(false);
+    native_wrapper_->GetView()->SetBounds(0, 0, width(), height());
+  } else {
+    gfx::Size checkmark_prefsize =
+        native_wrapper_->GetView()->GetPreferredSize();
+    int label_x = checkmark_prefsize.width() + kCheckboxLabelSpacing +
+        kLabelFocusPaddingHorizontal;
+    label_->SetBounds(
+        label_x, 0, std::max(0, width() - label_x -
+            kLabelFocusPaddingHorizontal),
+        height());
+    int first_line_height = label_->GetFont().height();
+    native_wrapper_->GetView()->SetBounds(
+        0, ((first_line_height - checkmark_prefsize.height()) / 2),
+        checkmark_prefsize.width(), checkmark_prefsize.height());
+  }
   native_wrapper_->GetView()->Layout();
 }