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

ui/views/window/custom_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/window/custom_frame_view.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/path.h"
 #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"
 #include "ui/views/window/frame_background.h"
 #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 {
 
 // The frame border is only visible in restored mode and is hardcoded to 4 px on
 // each side regardless of the system window border size.
 const int kFrameBorderThickness = 4;
 // In the window corners, the resize areas don't actually expand bigger, but the
 // 16 px at the end of each edge triggers diagonal resizing.
 const int kResizeAreaCornerSize = 16;
@@ skipping 16 matching lines @@
 const SkColor kDefaultColorFrame = SkColorSetRGB(109, 109, 109);
 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(176, 176, 176);
 #else
 // Windows and Linux use a blue.
 const SkColor kDefaultColorFrame = SkColorSetRGB(66, 116, 201);
 const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228);
 #endif
 
 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;
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameView, public:
 
 CustomFrameView::CustomFrameView()
     : frame_(NULL),
@@ skipping 200 matching lines @@
   // drawn flush with the screen edge, they still obey Fitts' Law.
   return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness;
 }
 
 int CustomFrameView::TitlebarBottomThickness() const {
   return kTitlebarTopAndBottomEdgeThickness +
       (ShouldShowClientEdge() ? kClientEdgeThickness : 0);
 }
 
 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 {
   int size = IconSize();
   int frame_thickness = FrameBorderThickness();
   // Our frame border has a different "3D look" than Windows'.  Theirs has a
   // more complex gradient on the top that they push their icon/title below;
   // then the maximized window cuts this off and the icon/title are centered
   // in the remaining space.  Because the apparent shape of our border is
   // simpler, using the same positioning makes things look slightly uncentered
@@ skipping 274 matching lines @@
                    rb.GetImageNamed(normal_image_id).ToImageSkia());
   button->SetImage(CustomButton::STATE_HOVERED,
                    rb.GetImageNamed(hot_image_id).ToImageSkia());
   button->SetImage(CustomButton::STATE_PRESSED,
                    rb.GetImageNamed(pushed_image_id).ToImageSkia());
   AddChildView(button);
   return button;
 }
 
 }  // namespace views