diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 14:44:58 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 14:44:58 +0000 |
| commit | 4bb1650eab539db9a51380ac8e0511d6a24150ee (patch) | |
| tree | 35367fd8b0bc24e6ae8673281e0d91e2fdff3162 /chrome/browser/chromeos/status/status_area_view.cc | |
| parent | 13911741bb908b3247b4bfc80d6733e102311e67 (diff) | |
| download | chromium_src-4bb1650eab539db9a51380ac8e0511d6a24150ee.zip chromium_src-4bb1650eab539db9a51380ac8e0511d6a24150ee.tar.gz chromium_src-4bb1650eab539db9a51380ac8e0511d6a24150ee.tar.bz2 | |
[Aura] Refresh status area widget bounds on StatusAreaView layout.
Make ShelfLayoutController a ShelfLayoutManager for launcher, status windows.
Relanding http://codereview.chromium.org/8743014/
win_aura buildbot just needed a clobber.
BUG=105661
TEST=Manual. Status area is represented with all icons on Aura.
TBR=sky
Review URL: http://codereview.chromium.org/8819016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/status/status_area_view.cc')
| -rw-r--r-- | chrome/browser/chromeos/status/status_area_view.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/status/status_area_view.cc b/chrome/browser/chromeos/status/status_area_view.cc index 55355b2..5f67535 100644 --- a/chrome/browser/chromeos/status/status_area_view.cc +++ b/chrome/browser/chromeos/status/status_area_view.cc @@ -13,6 +13,10 @@ #include "ui/gfx/canvas.h" #include "ui/views/border.h" +#if defined(USE_AURA) +#include "ui/views/widget/widget.h" +#endif + // Number of pixels to separate each icon. #if defined(TOUCH_UI) const int kSeparation = 25; @@ -92,6 +96,10 @@ void StatusAreaView::ChildPreferredSizeChanged(View* child) { // 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) { |