macviews: reinstate close button

ui/views/bubble/bubble_frame_view.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/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "build/build_config.h"
@@ skipping 193 matching lines @@
     static const int kBottomBorderShadowSize = 2;
     rect.fBottom += SkIntToScalar(kBottomBorderShadowSize);
     window_mask->addRect(rect);
   }
   gfx::Path arrow_path;
   if (bubble_border_->GetArrowPath(gfx::Rect(size), &arrow_path))
     window_mask->addPath(arrow_path, 0, 0);
 }
 
 void BubbleFrameView::ResetWindowControls() {
-#if defined(OS_MACOSX)
-  // On Mac, close buttons are never shown.
-  close_->SetVisible(false);
-#else
   close_->SetVisible(GetWidget()->widget_delegate()->ShouldShowCloseButton());
-#endif
 }
 
 void BubbleFrameView::UpdateWindowIcon() {
   gfx::ImageSkia image;
   if (GetWidget()->widget_delegate()->ShouldShowWindowIcon())
     image = GetWidget()->widget_delegate()->GetWindowIcon();
   title_icon_->SetImage(&image);
 }
 
 void BubbleFrameView::UpdateWindowTitle() {
@@ skipping 290 matching lines @@
   size.Enlarge(client_insets.width(), client_insets.height());
   size.SetToMax(gfx::Size(title_bar_width, 0));
 
   if (footnote_container_)
     size.Enlarge(0, footnote_container_->GetHeightForWidth(size.width()));
 
   return size;
 }
 
 }  // namespace views