Chromium Code Reviews| Index: athena/system/system_ui_impl.cc |
| diff --git a/athena/system/system_ui_impl.cc b/athena/system/system_ui_impl.cc |
| index 39867ad96d81db742ea72b3c1f9fa8763b5c431a..d5247c32d2ad30619291cea7c414426569f08c54 100644 |
| --- a/athena/system/system_ui_impl.cc |
| +++ b/athena/system/system_ui_impl.cc |
| @@ -7,6 +7,8 @@ |
| #include "athena/system/device_socket_listener.h" |
| #include "athena/system/orientation_controller.h" |
| #include "athena/system/power_button_controller.h" |
| +#include "athena/system/status_icon_container_view.h" |
| +#include "athena/system/time_view.h" |
| #include "base/logging.h" |
| #include "base/memory/ref_counted.h" |
| #include "base/memory/scoped_ptr.h" |
| @@ -27,6 +29,15 @@ class SystemUIImpl : public SystemUI { |
| virtual ~SystemUIImpl() { |
| } |
| + virtual views::View* CreateTimeView() OVERRIDE { |
| + return new TimeView; |
| + } |
| + |
| + virtual views::View* CreateStatusIconView( |
| + aura::Window* popup_container) OVERRIDE { |
| + return new StatusIconContainerView(popup_container); |
| + } |
| + |
| private: |
| scoped_refptr<OrientationController> orientation_controller_; |
| scoped_ptr<PowerButtonController> power_button_controller_; |
| @@ -37,6 +48,10 @@ class SystemUIImpl : public SystemUI { |
| } // namespace |
| // static |
| +SystemUI* SystemUI::Get() { |
| + return instance; |
|
sadrul
2014/08/21 18:44:30
DCHECK(instance) (that would be consistent with th
|
| +} |
| + |
| SystemUI* SystemUI::Create( |
| scoped_refptr<base::TaskRunner> io_task_runner) { |
| DeviceSocketListener::CreateSocketManager(io_task_runner); |