[stash] 20140404-crbug-312961-mac-views-bridge-C-wholegrid

ui/views/window/custom_frame_view.cc

Index: ui/views/window/custom_frame_view.cc
diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc
index 9896b0f9f7b527dac3a9c3ab7ed099e7c0c25b4f..8c52bd795add8cb02fe36718304751f6975eda9f 100644
--- a/ui/views/window/custom_frame_view.cc
+++ b/ui/views/window/custom_frame_view.cc
@@ -19,7 +19,6 @@
 #include "ui/views/color_constants.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/views_delegate.h"
-#include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/client_view.h"
@@ -27,6 +26,12 @@
 #include "ui/views/window/window_resources.h"
 #include "ui/views/window/window_shape.h"
 
+#if defined(OS_MACOSX)
+#include "ui/views/widget/native_widget_aura.h"
+#else
+#include "ui/views/widget/native_widget_mac.h"
+#endif
+
 namespace views {
 
 namespace {
@@ -63,7 +68,11 @@ const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228);
 
 const gfx::FontList& GetTitleFontList() {
   static const gfx::FontList title_font_list =
+#if defined(OS_MACOSX)
+      gfx::FontList();
+#else
       NativeWidgetAura::GetWindowTitleFontList();
+#endif
   return title_font_list;
 }
 
@@ -284,13 +293,7 @@ int CustomFrameView::TitlebarBottomThickness() const {
 }
 
 int CustomFrameView::IconSize() const {
-#if defined(OS_WIN)
-  // This metric scales up if either the titlebar height or the titlebar font
-  // size are increased.
-  return GetSystemMetrics(SM_CYSMICON);
-#else
   return std::max(GetTitleFontList().GetHeight(), kIconMinimumSize);
-#endif
 }
 
 gfx::Rect CustomFrameView::IconBounds() const {