Index: chrome/browser/ui/views/frame/browser_view.h |
=================================================================== |
--- chrome/browser/ui/views/frame/browser_view.h (revision 110765) |
+++ chrome/browser/ui/views/frame/browser_view.h (working copy) |
@@ -629,7 +629,7 @@ |
// The Bookmark Bar View for this window. Lazily created. |
scoped_ptr<BookmarkBarView> bookmark_bar_view_; |
-#if !defined(OS_CHROMEOS) || defined(USE_AURA) |
+#if !defined(OS_CHROMEOS) |
// The download shelf view (view at the bottom of the page). ChromiumOS |
// uses ActiveDownloadsUI instead. |
scoped_ptr<DownloadShelfView> download_shelf_; |
Property changes on: chrome/browser/ui/views/frame/browser_view.h |
___________________________________________________________________ |
Deleted: svn:mergeinfo |