Index: athena/system/system_ui_impl.cc |
diff --git a/athena/system/system_ui_impl.cc b/athena/system/system_ui_impl.cc |
index 208192101ec8114884b680370f8a08f2f785df5c..a4437cc818dc7e1c2f2da9dd2b8cfe37076687e5 100644 |
--- a/athena/system/system_ui_impl.cc |
+++ b/athena/system/system_ui_impl.cc |
@@ -6,7 +6,6 @@ |
#include "athena/screen/public/screen_manager.h" |
#include "athena/system/background_controller.h" |
-#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" |
@@ -113,7 +112,7 @@ class SystemUIImpl : public SystemUI { |
} |
private: |
- scoped_refptr<OrientationController> orientation_controller_; |
+ scoped_ptr<OrientationController> orientation_controller_; |
scoped_ptr<PowerButtonController> power_button_controller_; |
scoped_ptr<BackgroundController> background_controller_; |
@@ -130,7 +129,6 @@ class SystemUIImpl : public SystemUI { |
// static |
SystemUI* SystemUI::Create(scoped_refptr<base::TaskRunner> file_task_runner) { |
- DeviceSocketListener::CreateSocketManager(file_task_runner); |
SystemUIImpl* system_ui = new SystemUIImpl(file_task_runner); |
instance = system_ui; |
system_ui->Init(); |
@@ -148,7 +146,6 @@ void SystemUI::Shutdown() { |
CHECK(instance); |
delete instance; |
instance = NULL; |
- DeviceSocketListener::ShutdownSocketManager(); |
} |
} // namespace athena |