diff options
| -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); |