| 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 c825ee6fc67f4e133902f3cd515f0727e235cba4..1dbd9fb76f2f2b6a4c28539e2bb4f45b49ede3fa 100644
|
| --- a/ui/views/window/custom_frame_view.cc
|
| +++ b/ui/views/window/custom_frame_view.cc
|
| @@ -19,6 +19,7 @@
|
| #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"
|
| @@ -26,10 +27,6 @@
|
| #include "ui/views/window/window_resources.h"
|
| #include "ui/views/window/window_shape.h"
|
|
|
| -#if defined(USE_AURA)
|
| -#include "ui/views/widget/native_widget_aura.h"
|
| -#endif
|
| -
|
| namespace views {
|
|
|
| namespace {
|
| @@ -66,12 +63,7 @@ const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228);
|
|
|
| const gfx::FontList& GetTitleFontList() {
|
| static const gfx::FontList title_font_list =
|
| -#if defined(USE_AURA)
|
| NativeWidgetAura::GetWindowTitleFontList();
|
| -#elif defined(OS_LINUX)
|
| - // TODO(ben): need to resolve what font this is.
|
| - gfx::FontList();
|
| -#endif
|
| return title_font_list;
|
| }
|
|
|
|
|