Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7746)

Unified Diff: athena/system/system_ui_impl.cc

Issue 574113002: Use chromeos accelerometer reader and support only lid accelerometer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with master. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/system/orientation_controller.cc ('k') | athena/test/athena_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..67076e56218e3cdfcc3daf2a5aeede1e4ea8822d 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"
@@ -75,12 +74,12 @@ class SystemInfoView : public views::View {
class SystemUIImpl : public SystemUI {
public:
- SystemUIImpl(scoped_refptr<base::TaskRunner> file_task_runner)
+ SystemUIImpl(scoped_refptr<base::TaskRunner> blocking_task_runner)
: orientation_controller_(new OrientationController()),
power_button_controller_(new PowerButtonController),
background_container_(NULL),
system_modal_container_(NULL) {
- orientation_controller_->InitWith(file_task_runner);
+ orientation_controller_->InitWith(blocking_task_runner);
}
virtual ~SystemUIImpl() {
@@ -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_;
@@ -129,9 +128,9 @@ class SystemUIImpl : public SystemUI {
} // namespace
// static
-SystemUI* SystemUI::Create(scoped_refptr<base::TaskRunner> file_task_runner) {
- DeviceSocketListener::CreateSocketManager(file_task_runner);
- SystemUIImpl* system_ui = new SystemUIImpl(file_task_runner);
+SystemUI* SystemUI::Create(
+ scoped_refptr<base::TaskRunner> blocking_task_runner) {
+ SystemUIImpl* system_ui = new SystemUIImpl(blocking_task_runner);
instance = system_ui;
system_ui->Init();
return instance;
@@ -148,7 +147,6 @@ void SystemUI::Shutdown() {
CHECK(instance);
delete instance;
instance = NULL;
- DeviceSocketListener::ShutdownSocketManager();
}
} // namespace athena
« no previous file with comments | « athena/system/orientation_controller.cc ('k') | athena/test/athena_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698