diff options
| author | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-10 19:18:15 +0000 |
|---|---|---|
| committer | mad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-10 19:18:15 +0000 |
| commit | 6d7b953ec6132658ec7f85c2976c98ecd0c852b2 (patch) | |
| tree | c318e59ed09ce88dafb5fabc094a26247bf52ebd /chrome/browser/views/download_shelf_view.cc | |
| parent | 08658a41d004daaf4183537fe2314eb2532881ee (diff) | |
| download | chromium_src-6d7b953ec6132658ec7f85c2976c98ecd0c852b2.zip chromium_src-6d7b953ec6132658ec7f85c2976c98ecd0c852b2.tar.gz chromium_src-6d7b953ec6132658ec7f85c2976c98ecd0c852b2.tar.bz2 | |
Relanding of http://codereview.chromium.org/16488.
Adding proper project dependency in chrome.sln.
Review URL: http://codereview.chromium.org/21188
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/download_shelf_view.cc')
| -rw-r--r-- | chrome/browser/views/download_shelf_view.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index 5467be7..d4e02ed 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,6 +207,9 @@ 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(); @@ -270,3 +273,6 @@ void DownloadShelfView::ButtonPressed(views::BaseButton* button) { shelf_animation_->Hide(); } +bool DownloadShelfView::IsShowing() const { + return shelf_animation_->IsShowing(); +} |