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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: views/window/custom_frame_view.cc

Issue 7741001: Add Aura support to views: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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 | « views/widget/widget_unittest.cc ('k') | views/window/native_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/window/custom_frame_view.cc
===================================================================
--- views/window/custom_frame_view.cc (revision 98084)
+++ views/window/custom_frame_view.cc (working copy)
@@ -20,7 +20,7 @@
#include "views/window/hit_test.h"
#endif
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
#include "views/widget/native_widget_win.h"
#endif
@@ -567,7 +567,7 @@
void CustomFrameView::InitClass() {
static bool initialized = false;
if (!initialized) {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
title_font_ = new gfx::Font(NativeWidgetWin::GetWindowTitleFont());
#elif defined(OS_LINUX)
// TODO(ben): need to resolve what font this is.
« no previous file with comments | « views/widget/widget_unittest.cc ('k') | views/window/native_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698