diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 15:39:58 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 15:39:58 +0000 |
| commit | 41423098805b3f511e683123f2ff53c5fded1396 (patch) | |
| tree | f9421f58c664b57c0f1953b5e089145f07ff0ae7 /views/window | |
| parent | 2e2ed3b0a0325286ec7024d2d379fed9c141f8bb (diff) | |
| download | chromium_src-41423098805b3f511e683123f2ff53c5fded1396.zip chromium_src-41423098805b3f511e683123f2ff53c5fded1396.tar.gz chromium_src-41423098805b3f511e683123f2ff53c5fded1396.tar.bz2 | |
Add Aura support to views:
- change aura GYP_DEFINE to use_aura to be consistent with other switches
- add gfx::NativeView/Window typedefs
- add NativeWidgetAura/etc.
- update some ifdefs and includes to build on windows.
http://crbug.com/93944
TEST=none
Review URL: http://codereview.chromium.org/7741001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98234 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
| -rw-r--r-- | views/window/custom_frame_view.cc | 4 | ||||
| -rw-r--r-- | views/window/native_frame_view.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index 0c18819..2d1b7a1 100644 --- a/views/window/custom_frame_view.cc +++ b/views/window/custom_frame_view.cc @@ -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::LayoutClientView() { 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. diff --git a/views/window/native_frame_view.cc b/views/window/native_frame_view.cc index 2eafa23..8cb7dfd 100644 --- a/views/window/native_frame_view.cc +++ b/views/window/native_frame_view.cc @@ -7,7 +7,7 @@ #include "views/widget/native_widget.h" #include "views/widget/widget.h" -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) #include "views/widget/native_widget_win.h" #endif @@ -33,7 +33,7 @@ gfx::Rect NativeFrameView::GetBoundsForClientView() const { gfx::Rect NativeFrameView::GetWindowBoundsForClientBounds( const gfx::Rect& client_bounds) const { -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) RECT rect = client_bounds.ToRECT(); NativeWidgetWin* widget_win = static_cast<NativeWidgetWin*>(frame_->native_widget()); |