chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc - Issue 9478015: Aura: Build on the linux desktop, plus add USE_ASH.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Attempt to refix chromeos 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 1851f5e1c7e3c187aced5c8b64bd416bf75d6804..5f672af990a4c8542264e7f607b9428874b1f745 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

-#if defined(USE_AURA)

+#if defined(USE_ASH)

#include "ash/wm/window_animations.h"

#endif

@@ -349,8 +349,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);

Elliot Glaysher 2012/02/28 18:13:32 This doesn't look as good without upstreaming the

« build/common.gypi ('K') | « build/common.gypi ('k') | chrome/browser/ui/views/select_file_dialog_aura.cc » ('j') | chrome/browser/ui/views/select_file_dialog_aura.cc » ('J')