Index: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc |
=================================================================== |
--- chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc (revision 99764) |
+++ chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc (working copy) |
@@ -38,8 +38,10 @@ |
#include <objidl.h> |
#include "base/win/scoped_gdi_object.h" |
+#if !defined(USE_AURA) |
#include "views/widget/native_widget_win.h" |
#endif |
+#endif |
#if defined(TOOLKIT_USES_GTK) |
#include "ui/gfx/skia_utils_gtk.h" |
@@ -117,7 +119,11 @@ |
}; |
gfx::NativeView GetRelativeWindowForPopup(gfx::NativeView edit_native_view) { |
-#if defined(OS_WIN) |
+#if defined(USE_AURA) |
+ // TODO(beng): |
+ NOTIMPLEMENTED(); |
+ return NULL; |
+#elif defined(OS_WIN) |
// When an IME is attached to the rich-edit control, retrieve its window |
// handle and show this popup window under the IME windows. |
// Otherwise, show this popup window under top-most windows. |
@@ -603,7 +609,7 @@ |
} |
void AutocompletePopupContentsView::UpdateBlurRegion() { |
-#if defined(OS_WIN) |
+#if defined(OS_WIN) && !defined(USE_AURA) |
// We only support background blurring on Vista with Aero-Glass enabled. |
if (!views::NativeWidgetWin::IsAeroGlassEnabled() || !GetWidget()) |
return; |