Windows: Make the notification close button look the same as the tab close bu...

chrome/browser/views/notifications/balloon_view.cc

 // Copyright (c) 2010 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/views/notifications/balloon_view.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 37 matching lines @@
 
 const int kTopMargin = 2;
 const int kBottomMargin = 0;
 const int kLeftMargin = 4;
 const int kRightMargin = 4;
 const int kShelfBorderTopOverlap = 0;
 
 // Properties of the dismiss button.
 const int kDismissButtonWidth = 14;
 const int kDismissButtonHeight = 14;
-const int kDismissButtonRightMargin = 10;
+const int kDismissButtonTopMargin = 6;
+const int kDismissButtonRightMargin = 6;
 
 // Properties of the options menu.
-const int kOptionsButtonWidth = 26;
+const int kOptionsButtonWidth = 21;
 const int kOptionsButtonHeight = 14;
-const int kOptionsButtonRightMargin = 10;
+const int kOptionsButtonTopMargin = 5;
+const int kOptionsButtonRightMargin = 4;
 
 // Properties of the origin label.
-const int kLeftLabelMargin = 10;
+const int kLabelLeftMargin = 10;
+const int kLabelTopMargin = 6;
 
 // Size of the drop shadow.  The shadow is provided by BubbleBorder,
 // not this class.
 const int kLeftShadowWidth = 0;
 const int kRightShadowWidth = 0;
 const int kTopShadowWidth = 0;
 const int kBottomShadowWidth = 6;
 
 // Optional animation.
 const bool kAnimateEnabled = true;
 
 // The shelf height for the system default font size.  It is scaled
 // with changes in the default font size.
 const int kDefaultShelfHeight = 22;
-const int kShelfTopMargin = 6;
 
 // Menu commands
 const int kRevokePermissionCommand = 0;
 
 // Colors
 const SkColor kControlBarBackgroundColor = SkColorSetRGB(245, 245, 245);
 const SkColor kControlBarTextColor = SkColorSetRGB(125, 125, 125);
 const SkColor kControlBarSeparatorLineColor = SkColorSetRGB(180, 180, 180);
 
 }  // namespace
@@ skipping 148 matching lines @@
   html_contents_->SetPreferredSize(contents_rect.size());
   RenderWidgetHostView* view = html_contents_->render_view_host()->view();
   if (view)
     view->SetSize(contents_rect.size());
 }
 
 gfx::Rect BalloonViewImpl::GetCloseButtonBounds() const {
   return gfx::Rect(
       width() - kDismissButtonWidth -
           kDismissButtonRightMargin - kRightShadowWidth,
-      kShelfTopMargin,
+      kDismissButtonTopMargin,
       kDismissButtonWidth,
       kDismissButtonHeight);
 }
 
 gfx::Rect BalloonViewImpl::GetOptionsButtonBounds() const {
   gfx::Rect close_rect = GetCloseButtonBounds();
 
   return gfx::Rect(
       close_rect.x() - kOptionsButtonWidth - kOptionsButtonRightMargin,
-      kShelfTopMargin,
+      kOptionsButtonTopMargin,
       kOptionsButtonWidth,
       kOptionsButtonHeight);
 }
 
 gfx::Rect BalloonViewImpl::GetLabelBounds() const {
   return gfx::Rect(
-      kLeftShadowWidth + kLeftLabelMargin,
-      kShelfTopMargin,
+      kLeftShadowWidth + kLabelLeftMargin,
+      kLabelTopMargin,
       std::max(0, width() - kOptionsButtonWidth -
                kRightMargin),
       kOptionsButtonHeight);
 }
 
 void BalloonViewImpl::Show(Balloon* balloon) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   balloon_ = balloon;
 
@@ skipping 44 matching lines @@
                                                Widget::AcceptEvents,
                                                Widget::DeleteOnDestroy,
                                                Widget::DontMirrorOriginInRTL);
   frame_container_->SetWidgetDelegate(this);
   frame_container_->SetAlwaysOnTop(true);
   frame_container_->Init(NULL, balloon_rect);
   frame_container_->SetContentsView(this);
   frame_container_->MoveAbove(html_container_);
 
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
-      rb.GetBitmapNamed(IDR_BALLOON_CLOSE));
+                          rb.GetBitmapNamed(IDR_TAB_CLOSE));
   close_button_->SetImage(views::CustomButton::BS_HOT,
-      rb.GetBitmapNamed(IDR_BALLOON_CLOSE_HOVER));
+                          rb.GetBitmapNamed(IDR_TAB_CLOSE_H));
   close_button_->SetImage(views::CustomButton::BS_PUSHED,
-      rb.GetBitmapNamed(IDR_BALLOON_CLOSE_HOVER));
+                          rb.GetBitmapNamed(IDR_TAB_CLOSE_P));
   close_button_->SetBounds(GetCloseButtonBounds());
+  close_button_->SetBackground(SK_ColorBLACK,
+                               rb.GetBitmapNamed(IDR_TAB_CLOSE),
+                               rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK));
 
   options_menu_button_->SetIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH));
   options_menu_button_->SetHoverIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH_H));
   options_menu_button_->SetPushedIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH_P));
   options_menu_button_->set_alignment(views::TextButton::ALIGN_CENTER);
   options_menu_button_->SetBounds(GetOptionsButtonBounds());
 
   source_label_->SetFont(rb.GetFont(ResourceBundle::SmallFont));
   source_label_->SetColor(kControlBarTextColor);
   source_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
@@ skipping 138 matching lines @@
     NOTREACHED();
     return;
   }
 
   // If the renderer process attached to this balloon is disconnected
   // (e.g., because of a crash), we want to close the balloon.
   notification_registrar_.Remove(this,
       NotificationType::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon_));
   Close(false);
 }