diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 22:12:58 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 22:12:58 +0000 |
| commit | f081395e06004d74846b632a6151af2317b0234b (patch) | |
| tree | 7d0eca847bfd751eaa8612509263d0bfd4c8a415 | |
| parent | 690e6def32cb06cefbca5c4574d68a5a6a5c1d1b (diff) | |
| download | chromium_src-f081395e06004d74846b632a6151af2317b0234b.zip chromium_src-f081395e06004d74846b632a6151af2317b0234b.tar.gz chromium_src-f081395e06004d74846b632a6151af2317b0234b.tar.bz2 | |
Update widget size from StatusAreaView::Layout()
Change-Id: I461b53554bb67f6fe9681d04940e2131e2a9224c
BUG=chromium-os:107309
TEST=See issue
Review URL: http://codereview.chromium.org/8932001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114501 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/status/status_area_view.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/chromeos/status/status_area_view.h | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/status/status_area_view.cc b/chrome/browser/chromeos/status/status_area_view.cc index f0ca351..9459cef 100644 --- a/chrome/browser/chromeos/status/status_area_view.cc +++ b/chrome/browser/chromeos/status/status_area_view.cc @@ -90,16 +90,20 @@ void StatusAreaView::Layout() { } } +void StatusAreaView::PreferredSizeChanged() { +#if defined(USE_AURA) + if (GetWidget()) + GetWidget()->SetSize(GetPreferredSize()); +#endif + views::AccessiblePaneView::PreferredSizeChanged(); +} + void StatusAreaView::ChildPreferredSizeChanged(View* child) { // When something like the clock menu button's size changes, we need to // relayout. Also mark that this view's size has changed. This will let // BrowserView know to relayout, which will reset the bounds of this view. Layout(); PreferredSizeChanged(); -#if defined(USE_AURA) - if (GetWidget()) - GetWidget()->SetSize(GetPreferredSize()); -#endif } void StatusAreaView::MakeButtonsActive(bool active) { diff --git a/chrome/browser/chromeos/status/status_area_view.h b/chrome/browser/chromeos/status/status_area_view.h index a243652..9c53a72 100644 --- a/chrome/browser/chromeos/status/status_area_view.h +++ b/chrome/browser/chromeos/status/status_area_view.h @@ -42,6 +42,7 @@ class StatusAreaView : public views::AccessiblePaneView, // views::View* overrides. virtual gfx::Size GetPreferredSize() OVERRIDE; virtual void Layout() OVERRIDE; + virtual void PreferredSizeChanged() OVERRIDE; virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; private: |