diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 23:20:01 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 23:20:01 +0000 |
| commit | d6d0cbd98411bed026ff36862b3f8075d9f028ec (patch) | |
| tree | 88d7d3dd807bb330c9b82ced45644c1ea3e1aa01 /views/window | |
| parent | 5e19e6be8418668ad8f120dd3452eaf3ac32431a (diff) | |
| download | chromium_src-d6d0cbd98411bed026ff36862b3f8075d9f028ec.zip chromium_src-d6d0cbd98411bed026ff36862b3f8075d9f028ec.tar.gz chromium_src-d6d0cbd98411bed026ff36862b3f8075d9f028ec.tar.bz2 | |
Show a Window in the aura views demo.
http://crbug.com/93944
TEST=none
Review URL: http://codereview.chromium.org/7744045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
| -rw-r--r-- | views/window/custom_frame_view.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index 2d1b7a1..e21ea3f 100644 --- a/views/window/custom_frame_view.cc +++ b/views/window/custom_frame_view.cc @@ -20,7 +20,9 @@ #include "views/window/hit_test.h" #endif -#if defined(OS_WIN) && !defined(USE_AURA) +#if defined(USE_AURA) +#include "views/widget/native_widget_aura.h" +#elif defined(OS_WIN) #include "views/widget/native_widget_win.h" #endif @@ -567,7 +569,9 @@ void CustomFrameView::LayoutClientView() { void CustomFrameView::InitClass() { static bool initialized = false; if (!initialized) { -#if defined(OS_WIN) && !defined(USE_AURA) +#if defined(USE_AURA) + title_font_ = new gfx::Font(NativeWidgetAura::GetWindowTitleFont()); +#elif defined(OS_WIN) title_font_ = new gfx::Font(NativeWidgetWin::GetWindowTitleFont()); #elif defined(OS_LINUX) // TODO(ben): need to resolve what font this is. |