diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 17:47:15 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 17:47:15 +0000 |
| commit | bbc270be829518bf84edc103149f6a7534be7182 (patch) | |
| tree | 375014a6f90e64bb12e5e1725d80d3f0ecd206ce | |
| parent | 629ed3ab57b51a42b5c27bd412f7cd61a0026716 (diff) | |
| download | chromium_src-bbc270be829518bf84edc103149f6a7534be7182.zip chromium_src-bbc270be829518bf84edc103149f6a7534be7182.tar.gz chromium_src-bbc270be829518bf84edc103149f6a7534be7182.tar.bz2 | |
Fix Aura Windows bustage.
BUG=none
TEST=none
TBR=saintlou
Review URL: http://codereview.chromium.org/7950002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101772 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | views/bubble/bubble_view.cc | 12 | ||||
| -rw-r--r-- | views/focus/accelerator_handler.h | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/views/bubble/bubble_view.cc b/views/bubble/bubble_view.cc index 5397f6e..b4f6789 100644 --- a/views/bubble/bubble_view.cc +++ b/views/bubble/bubble_view.cc @@ -11,9 +11,9 @@ #include "views/layout/layout_constants.h" #include "views/views_delegate.h" #include "views/window/client_view.h" -#if defined(OS_WIN) -#include "views/widget/native_widget_win.h" -#else +#if defined(USE_AURA) +#include "views/widget/native_widget_aura.h" +#elif defined(TOOLKIT_USES_GTK) #include "views/widget/native_widget_gtk.h" #endif #include "views/widget/widget.h" @@ -114,7 +114,11 @@ void BubbleView::AnimationProgressed(const ui::Animation* animation) { SkColor opacity = static_cast<SkColor>( animation->GetCurrentValue() * 255); -#if defined(OS_WIN) +#if defined(USE_AURA) + NOTIMPLEMENTED(); + // TODO: probably a good idea to make this a Widget API method rather than + // directly manipulating the native widget here. +#elif defined(OS_WIN) SetLayeredWindowAttributes(GetWidget()->GetNativeView(), 0, static_cast<byte>(opacity), LWA_ALPHA); #else diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h index 36c2f98..f7c80c1 100644 --- a/views/focus/accelerator_handler.h +++ b/views/focus/accelerator_handler.h @@ -21,7 +21,7 @@ namespace views { #if (defined(TOUCH_UI) && !defined(USE_WAYLAND)) \ - || (!defined(WIN_OS) && defined(USE_AURA)) + || (!defined(OS_WIN) && defined(USE_AURA)) // Dispatch an XEvent to the RootView. Return true if the event was dispatched // and handled, false otherwise. bool VIEWS_EXPORT DispatchXEvent(XEvent* xevent); |