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

Side by Side Diff: athena/system/orientation_controller.h

Issue 490033003: Fixes three crashes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_ORIENTATION_CONTROLLER_H_ 5 #ifndef ATHENA_SYSTEM_ORIENTATION_CONTROLLER_H_
6 #define ATHENA_SYSTEM_ORIENTATION_CONTROLLER_H_ 6 #define ATHENA_SYSTEM_ORIENTATION_CONTROLLER_H_
7 7
8 #include "athena/system/device_socket_listener.h" 8 #include "athena/system/device_socket_listener.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 10 matching lines...) Expand all
21 namespace athena { 21 namespace athena {
22 22
23 // Monitors accelerometers, detecting orientation changes. When a change is 23 // Monitors accelerometers, detecting orientation changes. When a change is
24 // detected rotates the root window to match. 24 // detected rotates the root window to match.
25 class OrientationController 25 class OrientationController
26 : public DeviceSocketListener, 26 : public DeviceSocketListener,
27 public base::RefCountedThreadSafe<OrientationController> { 27 public base::RefCountedThreadSafe<OrientationController> {
28 public: 28 public:
29 OrientationController(); 29 OrientationController();
30 30
31 void InitWith(scoped_refptr<base::TaskRunner> io_task_runner); 31 void InitWith(scoped_refptr<base::TaskRunner> file_task_runner);
32
33 // Stop watching the socket path.
34 void StopWatchingSocketPath();
32 35
33 private: 36 private:
34 friend class base::RefCountedThreadSafe<OrientationController>; 37 friend class base::RefCountedThreadSafe<OrientationController>;
35 38
36 virtual ~OrientationController(); 39 virtual ~OrientationController();
37 40
38 // Watch for the socket path to be created, called on the IO thread. 41 // Watch for the socket path to be created, called on the FILE thread.
39 void WatchForSocketPathOnIO(); 42 void WatchForSocketPathOnFILE();
40 void OnFilePathChangedOnIO(const base::FilePath& path, bool error); 43 void OnFilePathChangedOnFILE(const base::FilePath& path, bool error);
41 44
42 // Overridden from device::DeviceSocketListener: 45 // Overridden from device::DeviceSocketListener:
43 virtual void OnDataAvailableOnIO(const void* data) OVERRIDE; 46 virtual void OnDataAvailableOnFILE(const void* data) OVERRIDE;
44 47
45 // Rotates the display to |rotation|, called on the UI thread. 48 // Rotates the display to |rotation|, called on the UI thread.
46 void RotateOnUI(gfx::Display::Rotation rotation); 49 void RotateOnUI(gfx::Display::Rotation rotation);
47 50
48 // The last configured rotation. 51 // The last configured rotation.
49 gfx::Display::Rotation current_rotation_; 52 gfx::Display::Rotation current_rotation_;
50 53
51 // The timestamp of the last applied orientation change. 54 // The timestamp of the last applied orientation change.
52 int64_t last_orientation_change_time_; 55 int64_t last_orientation_change_time_;
53 56
54 // A task runner for the UI thread. 57 // A task runner for the UI thread.
55 scoped_refptr<base::TaskRunner> ui_task_runner_; 58 scoped_refptr<base::TaskRunner> ui_task_runner_;
56 59
57 // File path watcher used to detect when sensors are present. 60 // File path watcher used to detect when sensors are present.
58 scoped_ptr<base::FilePathWatcher> watcher_; 61 scoped_ptr<base::FilePathWatcher> watcher_;
59 62
60 DISALLOW_COPY_AND_ASSIGN(OrientationController); 63 DISALLOW_COPY_AND_ASSIGN(OrientationController);
61 }; 64 };
62 65
63 } // namespace athena 66 } // namespace athena
64 67
65 #endif // ATHENA_SYSTEM_ORIENTATION_CONTROLLER_H_ 68 #endif // ATHENA_SYSTEM_ORIENTATION_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698