Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Unified Diff: ui/views/window/custom_frame_view.cc

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: incorporate feedback Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/widget_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « ui/views/widget/widget_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698