Chromium Code Reviews| Index: ash/status_area/status_area_view.h |
| diff --git a/ash/status_area/status_area_view.h b/ash/status_area/status_area_view.h |
| index 32d9f373ffcd99d0fd434034251871e6586d997f..81089a0e2968dfe8b7911a9eb05d3410febd9fa0 100644 |
| --- a/ash/status_area/status_area_view.h |
| +++ b/ash/status_area/status_area_view.h |
| @@ -13,6 +13,8 @@ |
| namespace ash { |
| namespace internal { |
| +class FocusCycler; |
| + |
| class StatusAreaView : public views::WidgetDelegate, |
| public views::AccessiblePaneView { |
| public: |
| @@ -24,10 +26,17 @@ class StatusAreaView : public views::WidgetDelegate, |
| virtual views::Widget* GetWidget() OVERRIDE; |
| virtual const views::Widget* GetWidget() const OVERRIDE; |
| + // views::WidgetDelegate overrides: |
| + virtual bool CanActivate() const OVERRIDE; |
| + |
| + // Sets the focus cycler. |
|
sky
2012/03/06 16:49:40
Move this above overriden methods.
Yusuke Sato
2012/03/07 01:28:46
Done.
|
| + void SetFocusCyclerForTesting(const FocusCycler* focus_cycler); |
| + |
| private: |
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
| SkBitmap status_mock_; |
| + const FocusCycler* focus_cycler_for_testing_; |
| DISALLOW_COPY_AND_ASSIGN(StatusAreaView); |
| }; |