Index: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc |
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc |
index f07583362350e189599af46ab746868e3d1e3526..14299467c21b1e69d0b789f68700ebb83a4e6f06 100644 |
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc |
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc |
@@ -20,10 +20,7 @@ |
#include "ui/views/controls/image_view.h" |
#include "ui/views/widget/widget.h" |
#include "ui/views/window/non_client_view.h" |
- |
-#if defined(USE_AURA) |
#include "ui/wm/core/window_animations.h" |
-#endif |
// This is the number of pixels in the border image interior to the actual |
// border. |
@@ -222,10 +219,8 @@ void OmniboxPopupContentsView::UpdatePopupAppearance() { |
// avoid a NULL dereference. |
if (!popup_.get()) |
return; |
-#if defined(USE_AURA) |
wm::SetWindowVisibilityAnimationTransition( |
popup_->GetNativeView(), wm::ANIMATE_NONE); |
-#endif |
popup_->SetContentsView(this); |
popup_->StackAbove(omnibox_view_->GetRelativeWindowForPopup()); |
if (!popup_.get()) { |