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

Unified Diff: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc

Issue 9478015: Aura: Build on the linux desktop, plus add USE_ASH. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try to minimize shell.h change Created 8 years, 10 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/autocomplete/autocomplete_popup_contents_view.cc
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
index f7fb596a18e1d9b3a19c9b1d967410b9b239ab1e..6367b25ec766972c8ac5730e70d678d194f0ea36 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -45,7 +45,7 @@
#include "ui/views/widget/native_widget_win.h"
#endif
#endif
-#if defined(USE_AURA)
+#if defined(USE_ASH)
#include "ash/wm/window_animations.h"
#endif
@@ -360,8 +360,7 @@ void AutocompletePopupContentsView::UpdatePopupAppearance() {
params.parent_widget = location_bar_->GetWidget();
params.bounds = GetPopupBounds();
popup_->Init(params);
-#if defined(USE_AURA)
- // TODO(beng): This should be if defined(USE_ASH)
+#if defined(USE_ASH)
ash::SetWindowVisibilityAnimationType(
popup_->GetNativeView(),
ash::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);

Powered by Google App Engine
This is Rietveld 408576698