Remove kDisableDownloadNotification and stop compiling shelf code on

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

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 8ab7ca973a22008f7dce3efb2ea502644c0776a5..32669a928ad9e9de9bf3504b5a9180aa34a1d347 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -65,7 +65,6 @@
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h"
-#include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
 #include "chrome/browser/ui/views/extensions/bookmark_app_bubble_view.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
@@ -179,6 +178,8 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
+#else
+#include "chrome/browser/ui/views/download/download_shelf_view.h"
 #endif
 
 #if defined(MOJO_SHELL_CLIENT)
@@ -347,11 +348,15 @@ class BrowserViewLayoutDelegateImpl : public BrowserViewLayoutDelegate {
   }
 
   bool DownloadShelfNeedsLayout() const override {
+#if defined(OS_CHROMEOS)
+    return false;
+#else
     DownloadShelfView* download_shelf = browser_view_->download_shelf_.get();
     // Re-layout the shelf either if it is visible or if its close animation
     // is currently running.
     return download_shelf &&
            (download_shelf->IsShowing() || download_shelf->IsClosing());
+#endif
   }
 
   bool IsTabStripVisible() const override {
@@ -1377,17 +1382,25 @@ void BrowserView::SetDownloadShelfVisible(bool visible) {
 }
 
 bool BrowserView::IsDownloadShelfVisible() const {
+#if defined(OS_CHROMEOS)
+  return false;
+#else
   return download_shelf_.get() && download_shelf_->IsShowing();
+#endif
 }
 
 DownloadShelf* BrowserView::GetDownloadShelf() {
-  DCHECK(browser_->SupportsWindowFeature(Browser::FEATURE_DOWNLOADSHELF));
+#if defined(OS_CHROMEOS)
+  NOTREACHED();
+  return nullptr;
+#else
   if (!download_shelf_.get()) {
     download_shelf_.reset(new DownloadShelfView(browser_.get(), this));
     download_shelf_->set_owned_by_client();
     GetBrowserViewLayout()->set_download_shelf(download_shelf_.get());
   }
   return download_shelf_.get();
+#endif
 }
 
 void BrowserView::ConfirmBrowserCloseWithPendingDownloads(
@@ -2687,17 +2700,21 @@ WebContents* BrowserView::GetActiveWebContents() {
 }
 
 void BrowserView::UnhideDownloadShelf() {
+#if !defined(OS_CHROMEOS)
   if (download_shelf_)
     download_shelf_->Unhide();
+#endif
 }
 
 void BrowserView::HideDownloadShelf() {
+#if !defined(OS_CHROMEOS)
   if (download_shelf_)
     download_shelf_->Hide();
 
   StatusBubble* status_bubble = GetStatusBubble();
   if (status_bubble)
     status_bubble->Hide();
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////