Revert 110765 - Fix DownloadTests and change cros/aura to use shelf

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_view.cc	(revision 110765)
+++ chrome/browser/ui/views/frame/browser_view.cc	(working copy)
@@ -128,9 +128,7 @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
-#endif
-
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
+#else
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #endif
 
@@ -359,7 +357,7 @@
   }
 #endif
 
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
+#if !defined(OS_CHROMEOS)
   // We destroy the download shelf before |browser_| to remove its child
   // download views from the set of download observers (since the observed
   // downloads can be destroyed along with |browser_| and the observer
@@ -1088,7 +1086,7 @@
 }
 
 bool BrowserView::IsDownloadShelfVisible() const {
-#if defined(OS_CHROMEOS) && !defined(USE_AURA)
+#if defined(OS_CHROMEOS)
   return false;
 #else
   return download_shelf_.get() && download_shelf_->IsShowing();
@@ -1096,7 +1094,7 @@
 }
 
 DownloadShelf* BrowserView::GetDownloadShelf() {
-#if defined(OS_CHROMEOS) && !defined(USE_AURA)
+#if defined(OS_CHROMEOS)
   NOTREACHED();
   return NULL;
 #else
@@ -1744,7 +1742,7 @@
     panes->push_back(bookmark_bar_view_.get());
   if (infobar_container_)
     panes->push_back(infobar_container_);
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
+#if !defined(OS_CHROMEOS)
   if (download_shelf_.get())
     panes->push_back(download_shelf_.get());
 #endif
Property changes on: chrome/browser/ui/views/frame/browser_view.cc
___________________________________________________________________
Deleted: svn:mergeinfo