OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_ | 5 #ifndef ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_ |
6 #define ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_ | 6 #define ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_ |
7 | 7 |
8 #include "athena/system/public/system_ui.h" | 8 #include "athena/system/public/system_ui.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "ui/views/view.h" | 10 #include "ui/views/view.h" |
11 | 11 |
| 12 namespace aura { |
| 13 class Window; |
| 14 } |
| 15 |
12 namespace athena { | 16 namespace athena { |
13 | 17 |
14 // View which displays the system tray icons. | 18 // View which displays the system tray icons. |
15 class StatusIconContainerView : public views::View { | 19 class StatusIconContainerView : public views::View { |
16 public: | 20 public: |
17 StatusIconContainerView(SystemUI::ColorScheme color_scheme); | 21 StatusIconContainerView(SystemUI::ColorScheme color_scheme, |
| 22 aura::Window* popup_container); |
18 virtual ~StatusIconContainerView(); | 23 virtual ~StatusIconContainerView(); |
19 | 24 |
20 private: | 25 private: |
21 // views::View: | 26 // views::View: |
22 virtual bool OnMousePressed(const ui::MouseEvent& event) override; | 27 virtual bool OnMousePressed(const ui::MouseEvent& event) override; |
23 virtual void OnGestureEvent(ui::GestureEvent* event) override; | 28 virtual void OnGestureEvent(ui::GestureEvent* event) override; |
24 virtual void ChildPreferredSizeChanged(views::View* child) override; | 29 virtual void ChildPreferredSizeChanged(views::View* child) override; |
25 | 30 |
| 31 // Parent container that the "select network" dialog should use. |
| 32 aura::Window* system_modal_container_; |
| 33 |
26 class PowerStatus; | 34 class PowerStatus; |
27 scoped_ptr<PowerStatus> power_status_; | 35 scoped_ptr<PowerStatus> power_status_; |
28 | 36 |
29 class NetworkStatus; | 37 class NetworkStatus; |
30 scoped_ptr<NetworkStatus> network_status_; | 38 scoped_ptr<NetworkStatus> network_status_; |
31 | 39 |
32 class UpdateStatus; | 40 class UpdateStatus; |
33 scoped_ptr<UpdateStatus> update_status_; | 41 scoped_ptr<UpdateStatus> update_status_; |
34 | 42 |
35 DISALLOW_COPY_AND_ASSIGN(StatusIconContainerView); | 43 DISALLOW_COPY_AND_ASSIGN(StatusIconContainerView); |
36 }; | 44 }; |
37 | 45 |
38 } // namespace athena | 46 } // namespace athena |
39 | 47 |
40 #endif // ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_ | 48 #endif // ATHENA_SYSTEM_STATUS_ICON_CONTAINER_VIEW_H_ |
OLD | NEW |