| Index: chrome/browser/ui/views/frame/browser_view_layout.cc
|
| diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
|
| index 1814dca6c9740a47e02b1b64acef7afa3874edb4..5d9b895da12e5382797c3538cc4ef73142efaeb4 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view_layout.cc
|
| +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
|
| @@ -8,6 +8,7 @@
|
| #include "chrome/browser/ui/find_bar/find_bar_controller.h"
|
| #include "chrome/browser/ui/view_ids.h"
|
| #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
|
| +#include "chrome/browser/ui/views/download/download_shelf_view.h"
|
| #include "chrome/browser/ui/views/frame/browser_frame.h"
|
| #include "chrome/browser/ui/views/frame/browser_view.h"
|
| #include "chrome/browser/ui/views/frame/contents_container.h"
|
| @@ -21,9 +22,6 @@
|
| #include "ui/gfx/size.h"
|
| #include "ui/views/controls/single_split_view.h"
|
|
|
| -#if !defined(OS_CHROMEOS) || defined(USE_AURA)
|
| -#include "chrome/browser/ui/views/download/download_shelf_view.h"
|
| -#endif
|
|
|
| namespace {
|
|
|
| @@ -436,10 +434,8 @@ int BrowserViewLayout::GetTopMarginForActiveContent() {
|
| }
|
|
|
| int BrowserViewLayout::LayoutDownloadShelf(int bottom) {
|
| -#if !defined(OS_CHROMEOS) || defined(USE_AURA)
|
| // Re-layout the shelf either if it is visible or if its close animation
|
| - // is currently running. ChromiumOS uses ActiveDownloadsUI instead of
|
| - // DownloadShelf.
|
| + // is currently running.
|
| if (browser_view_->IsDownloadShelfVisible() ||
|
| (download_shelf_ && download_shelf_->IsClosing())) {
|
| bool visible = browser()->SupportsWindowFeature(
|
| @@ -452,7 +448,6 @@ int BrowserViewLayout::LayoutDownloadShelf(int bottom) {
|
| download_shelf_->Layout();
|
| bottom -= height;
|
| }
|
| -#endif
|
| return bottom;
|
| }
|
|
|
|
|