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