[DeviceLight API] Content Side

content/browser/device_orientation/sensor_manager_android.h

Index: content/browser/device_orientation/sensor_manager_android.h
diff --git a/content/browser/device_orientation/sensor_manager_android.h b/content/browser/device_orientation/sensor_manager_android.h
index 6276065dc25d2a81199b9f6407f27439abf12963..717bb938e291173e71c7b290dd033dac84a5f442 100644
--- a/content/browser/device_orientation/sensor_manager_android.h
+++ b/content/browser/device_orientation/sensor_manager_android.h
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_DEVICE_ORIENTATION_SENSOR_MANAGER_ANDROID_H_
-#define CHROME_BROWSER_DEVICE_ORIENTATION_SENSOR_MANAGER_ANDROID_H_
+#ifndef CONTENT_BROWSER_DEVICE_ORIENTATION_SENSOR_MANAGER_ANDROID_H_
+#define CONTENT_BROWSER_DEVICE_ORIENTATION_SENSOR_MANAGER_ANDROID_H_
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
+#include "content/common/device_light/device_light_hardware_buffer.h"
 #include "content/common/device_orientation/device_motion_hardware_buffer.h"
 #include "content/common/device_orientation/device_orientation_hardware_buffer.h"
 
@@ -30,6 +31,8 @@ class CONTENT_EXPORT SensorManagerAndroid {
   static SensorManagerAndroid* GetInstance();
 
   // Called from Java via JNI.
+  void GotLight(JNIEnv*, jobject,
+                double value);
   void GotOrientation(JNIEnv*, jobject,
                       double alpha, double beta, double gamma);
   void GotAcceleration(JNIEnv*, jobject,
@@ -40,6 +43,9 @@ class CONTENT_EXPORT SensorManagerAndroid {
                        double alpha, double beta, double gamma);
 
   // Shared memory related methods.
+  bool StartFetchingDeviceLightData(DeviceLightHardwareBuffer* buffer);
+  void StopFetchingDeviceLightData();
+
   bool StartFetchingDeviceMotionData(DeviceMotionHardwareBuffer* buffer);
   void StopFetchingDeviceMotionData();
 
@@ -49,11 +55,12 @@ class CONTENT_EXPORT SensorManagerAndroid {
 
  protected:
   enum EventType {
-    // These constants should match DEVICE_ORIENTATION and DEVICE_MOTION
-    // constants in content/public/android/java/src/org/chromium/content/
-    // browser/DeviceMotionAndOrientation.java
+    // These constants should match DEVICE_ORIENTATION, DEVICE_MOTION and
+    // DEVICE_LIGHT constants in content/public/android/java/src/org/chromium/
+    // content/browser/DeviceMotionAndOrientation.java
     kTypeOrientation = 0,
-    kTypeMotion = 1
+    kTypeMotion = 1,
+    kTypeLight = 2
   };
 
   SensorManagerAndroid();
@@ -77,17 +84,23 @@ class CONTENT_EXPORT SensorManagerAndroid {
   void SetMotionBufferReadyStatus(bool ready);
   void ClearInternalMotionBuffers();
 
+  void SetLightBufferReadyStatus(bool ready);
+  void ClearInternalLightBuffers();
+
   void SetOrientationBufferReadyStatus(bool ready);
 
   // The Java provider of orientation info.
   base::android::ScopedJavaGlobalRef<jobject> device_orientation_;
   int number_active_device_motion_sensors_;
   int received_motion_data_[RECEIVED_MOTION_DATA_MAX];
+  DeviceLightHardwareBuffer* device_light_buffer_;
   DeviceMotionHardwareBuffer* device_motion_buffer_;
   DeviceOrientationHardwareBuffer* device_orientation_buffer_;
+  bool is_light_buffer_ready_;
   bool is_motion_buffer_ready_;
   bool is_orientation_buffer_ready_;
 
+  base::Lock light_buffer_lock_;
   base::Lock motion_buffer_lock_;
   base::Lock orientation_buffer_lock_;
 
@@ -96,4 +109,4 @@ class CONTENT_EXPORT SensorManagerAndroid {
 
 }  // namespace content
 
-#endif  // CHROME_BROWSER_DEVICE_ORIENTATION_SENSOR_MANAGER_ANDROID_H_
+#endif  // CONTENT_BROWSER_DEVICE_ORIENTATION_SENSOR_MANAGER_ANDROID_H_