Aura: Build on the linux desktop, plus add USE_ASH.

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
 
 #if defined(OS_WIN)
 #include <commctrl.h>
 #include <dwmapi.h>
 #include <objidl.h>
@@ skipping 27 matching lines @@
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 #include "unicode/ubidi.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #if !defined(USE_AURA)
 #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
 
 namespace {
 
 const SkAlpha kGlassPopupAlpha = 240;
 const SkAlpha kOpaquePopupAlpha = 255;
 
 // The size delta between the font used for the edit and the result rows. Passed
 // to gfx::Font::DeriveFont.
@@ skipping 294 matching lines @@
 
   if (popup_ == NULL) {
     // If the popup is currently closed, we need to create it.
     popup_ = (new AutocompletePopupWidget)->AsWeakPtr();
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
     params.can_activate = false;
     params.transparent = true;
     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);
 #endif
     popup_->SetContentsView(this);
     popup_->StackAbove(omnibox_view_->GetRelativeWindowForPopup());
     if (!popup_.get()) {
       // For some IMEs GetRelativeWindowForPopup triggers the omnibox to lose
       // focus, thereby closing (and destroying) the popup.
       // TODO(sky): this won't be needed once we close the omnibox on input
@@ skipping 331 matching lines @@
   opt_in_view_ = NULL;
   PromoCounter* counter = profile_->GetInstantPromoCounter();
   DCHECK(counter);
   counter->Hide();
   if (opt_in) {
     browser::ShowInstantConfirmDialogIfNecessary(
         location_bar_->GetWidget()->GetNativeWindow(), profile_);
   }
   UpdatePopupAppearance();
 }