Remove kDisableDownloadNotification and stop compiling shelf code on

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 516 matching lines @@
       !bookmark_bar_->IsDetached()) {
     return 0;
   }
 
   // Offset for the detached bookmark bar.
   return bookmark_bar_->height() -
       views::NonClientFrameView::kClientEdgeThickness;
 }
 
 int BrowserViewLayout::LayoutDownloadShelf(int bottom) {
-  if (delegate_->DownloadShelfNeedsLayout()) {
-    bool visible = browser()->SupportsWindowFeature(
-        Browser::FEATURE_DOWNLOADSHELF);
-    DCHECK(download_shelf_);
-    int height = visible ? download_shelf_->GetPreferredSize().height() : 0;
-    download_shelf_->SetVisible(visible);
-    download_shelf_->SetBounds(vertical_layout_rect_.x(), bottom - height,
-                               vertical_layout_rect_.width(), height);
-    download_shelf_->Layout();
-    bottom -= height;
-  }
-  return bottom;
+  if (!delegate_->DownloadShelfNeedsLayout())
+    return bottom;
+
+  DCHECK(download_shelf_);
+  int height = download_shelf_->GetPreferredSize().height();
+  download_shelf_->SetVisible(true);
+  download_shelf_->SetBounds(vertical_layout_rect_.x(), bottom - height,
+                             vertical_layout_rect_.width(), height);
+  download_shelf_->Layout();
+  return bottom - height;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // Cast to a views::View to access GetPreferredSize().
   views::View* infobar_container = infobar_container_;
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser_->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container->GetPreferredSize().height() != 0);
 }