chrome/browser/ui/views/frame/browser_view.h - Issue 8585040: Fix DownloadTests and change cros/aura to use shelf

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/frame/browser_view.h

Issue 8585040: Fix DownloadTests and change cros/aura to use shelf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Review nits Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/views/frame/browser_view.h

diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h

index c5f47c4c86ed22ec0fcbb5ff9ce6b566a79e45c9..92e8c57e328c4d5a9cecc80ea883326e58c0ca1d 100644

--- a/chrome/browser/ui/views/frame/browser_view.h

+++ b/chrome/browser/ui/views/frame/browser_view.h

@@ -629,7 +629,7 @@ class BrowserView : public BrowserBubbleHost,

// The Bookmark Bar View for this window. Lazily created.

scoped_ptr<BookmarkBarView> bookmark_bar_view_;

-#if !defined(OS_CHROMEOS)

+#if !defined(OS_CHROMEOS) || defined(USE_AURA)

// The download shelf view (view at the bottom of the page). ChromiumOS

// uses ActiveDownloadsUI instead.

scoped_ptr<DownloadShelfView> download_shelf_;