diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-17 21:52:27 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-17 21:52:27 +0000 |
| commit | 62a929643ca5ed6bbafd06593ae811bb6d718dd3 (patch) | |
| tree | cbf61f22a93687e6690764bf1e24c1a608cf99f9 /ui/aura_shell/status_area_view.h | |
| parent | 3b543ab59106f2f889df2412766572836d408bd4 (diff) | |
| download | chromium_src-62a929643ca5ed6bbafd06593ae811bb6d718dd3.zip chromium_src-62a929643ca5ed6bbafd06593ae811bb6d718dd3.tar.gz chromium_src-62a929643ca5ed6bbafd06593ae811bb6d718dd3.tar.bz2 | |
More shell hookup:
- NULL window_ in NativeWidgetAura::OnWindowDestroyed before notifying its delegate, and add a NULL check in NativeWidgetAura::SchedulePaint to prevent calls triggered by the Widget's RootView's destruction from calling into it. There may be a better fix here but it probably involves destroying the RootView sooner which is scary.
- Adds a mock status area.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7920016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/status_area_view.h')
| -rw-r--r-- | ui/aura_shell/status_area_view.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/ui/aura_shell/status_area_view.h b/ui/aura_shell/status_area_view.h index 2c1b4c5..873acc7 100644 --- a/ui/aura_shell/status_area_view.h +++ b/ui/aura_shell/status_area_view.h @@ -6,8 +6,27 @@ #define UI_AURA_SHELL_STATUS_AREA_VIEW_H_ #pragma once +#include "third_party/skia/include/core/SkBitmap.h" +#include "views/widget/widget_delegate.h" + namespace aura_shell { namespace internal { + +class StatusAreaView : public views::WidgetDelegateView { + public: + StatusAreaView(); + virtual ~StatusAreaView(); + + // Overridden from views::View: + virtual gfx::Size GetPreferredSize() OVERRIDE; + private: + virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + + SkBitmap status_mock_; + + DISALLOW_COPY_AND_ASSIGN(StatusAreaView); +}; + } // namespace internal } // namespace aura_shell |