Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just revert changes to ui/app_list/. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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()) {
« no previous file with comments | « chrome/browser/ui/views/keyboard_access_browsertest.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_result_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698