summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/download_shelf_view.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-09 21:33:13 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-09 21:33:13 +0000
commit4f30d5cc3ba59084ed1a47729be48edfd0fd669b (patch)
tree4515c97eeb9996c6b2c30e152262bda93015465a /chrome/browser/views/download_shelf_view.cc
parentbdb5267835bee24d3550e1aae9bdefa9cb885e49 (diff)
downloadchromium_src-4f30d5cc3ba59084ed1a47729be48edfd0fd669b.zip
chromium_src-4f30d5cc3ba59084ed1a47729be48edfd0fd669b.tar.gz
chromium_src-4f30d5cc3ba59084ed1a47729be48edfd0fd669b.tar.bz2
Reverting 9408.
Review URL: http://codereview.chromium.org/20190 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/download_shelf_view.cc')
-rw-r--r--chrome/browser/views/download_shelf_view.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc
index d4e02ed..5467be7 100644
--- a/chrome/browser/views/download_shelf_view.cc
+++ b/chrome/browser/views/download_shelf_view.cc
@@ -73,7 +73,7 @@ int CenterPosition(int size, int target_size) {
return std::max((target_size - size) / 2, kTopBottomPadding);
}
-} // namespace
+} // namespace
DownloadShelfView::DownloadShelfView(TabContents* tab_contents)
: tab_contents_(tab_contents) {
@@ -207,9 +207,6 @@ void DownloadShelfView::Layout() {
if (!GetWidget())
return;
- // Let our base class layout our child views
- views::View::Layout();
-
gfx::Size image_size = arrow_image_->GetPreferredSize();
gfx::Size close_button_size = close_button_->GetPreferredSize();
gfx::Size show_all_size = show_all_view_->GetPreferredSize();
@@ -273,6 +270,3 @@ void DownloadShelfView::ButtonPressed(views::BaseButton* button) {
shelf_animation_->Hide();
}
-bool DownloadShelfView::IsShowing() const {
- return shelf_animation_->IsShowing();
-}