OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef ASH_STATUS_AREA_STATUS_AREA_VIEW_H_ | 5 #ifndef ASH_STATUS_AREA_STATUS_AREA_VIEW_H_ |
6 #define ASH_STATUS_AREA_STATUS_AREA_VIEW_H_ | 6 #define ASH_STATUS_AREA_STATUS_AREA_VIEW_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "third_party/skia/include/core/SkBitmap.h" | 9 #include "third_party/skia/include/core/SkBitmap.h" |
10 #include "ui/views/accessible_pane_view.h" | 10 #include "ui/views/accessible_pane_view.h" |
11 #include "ui/views/widget/widget_delegate.h" | 11 #include "ui/views/widget/widget_delegate.h" |
12 | 12 |
13 namespace ash { | 13 namespace ash { |
14 namespace internal { | 14 namespace internal { |
15 | 15 |
16 class FocusCycler; | |
17 | |
16 class StatusAreaView : public views::WidgetDelegate, | 18 class StatusAreaView : public views::WidgetDelegate, |
17 public views::AccessiblePaneView { | 19 public views::AccessiblePaneView { |
18 public: | 20 public: |
19 StatusAreaView(); | 21 StatusAreaView(); |
20 virtual ~StatusAreaView(); | 22 virtual ~StatusAreaView(); |
21 | 23 |
22 // Overridden from views::View: | 24 // Overridden from views::View: |
23 virtual gfx::Size GetPreferredSize() OVERRIDE; | 25 virtual gfx::Size GetPreferredSize() OVERRIDE; |
24 virtual views::Widget* GetWidget() OVERRIDE; | 26 virtual views::Widget* GetWidget() OVERRIDE; |
25 virtual const views::Widget* GetWidget() const OVERRIDE; | 27 virtual const views::Widget* GetWidget() const OVERRIDE; |
26 | 28 |
29 // views::WidgetDelegate overrides: | |
30 virtual bool CanActivate() const OVERRIDE; | |
31 | |
32 // 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.
| |
33 void SetFocusCyclerForTesting(const FocusCycler* focus_cycler); | |
34 | |
27 private: | 35 private: |
28 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; | 36 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
29 | 37 |
30 SkBitmap status_mock_; | 38 SkBitmap status_mock_; |
39 const FocusCycler* focus_cycler_for_testing_; | |
31 | 40 |
32 DISALLOW_COPY_AND_ASSIGN(StatusAreaView); | 41 DISALLOW_COPY_AND_ASSIGN(StatusAreaView); |
33 }; | 42 }; |
34 | 43 |
35 } // namespace internal | 44 } // namespace internal |
36 } // namespace ash | 45 } // namespace ash |
37 | 46 |
38 #endif // ASH_STATUS_AREA_STATUS_AREA_VIEW_H_ | 47 #endif // ASH_STATUS_AREA_STATUS_AREA_VIEW_H_ |
OLD | NEW |