diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 01:46:32 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 01:46:32 +0000 |
| commit | aa6752c9a0de6bcf43662bdc56db50499968cb2d (patch) | |
| tree | a6d72713405094abd820a76457c94c7cbfa27150 /views | |
| parent | 57a67eb1ca31e2832a022455b634474fc5d11cbe (diff) | |
| download | chromium_src-aa6752c9a0de6bcf43662bdc56db50499968cb2d.zip chromium_src-aa6752c9a0de6bcf43662bdc56db50499968cb2d.tar.gz chromium_src-aa6752c9a0de6bcf43662bdc56db50499968cb2d.tar.bz2 | |
Fixes bug in NativeWidgetWin::GetAcceleratedWidget. I had the ifdef
wrong.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/6992086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/native_widget_win.cc | 4 | ||||
| -rw-r--r-- | views/widget/widget.cc | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/views/widget/native_widget_win.cc b/views/widget/native_widget_win.cc index 20799fa..b154dc4 100644 --- a/views/widget/native_widget_win.cc +++ b/views/widget/native_widget_win.cc @@ -1147,9 +1147,9 @@ void NativeWidgetWin::ClientAreaSizeChanged() { gfx::AcceleratedWidget NativeWidgetWin::GetAcceleratedWidget() { #if defined(VIEWS_COMPOSITOR) - return gfx::kNullAcceleratedWidget; -#else return hwnd(); +#else + return gfx::kNullAcceleratedWidget; #endif } diff --git a/views/widget/widget.cc b/views/widget/widget.cc index c6d2556..ad537f1 100644 --- a/views/widget/widget.cc +++ b/views/widget/widget.cc @@ -21,7 +21,6 @@ namespace { bool use_pure_views = false; } - //////////////////////////////////////////////////////////////////////////////// // Widget, InitParams: |