Use standardized and extendable accelerometer update type.

chromeos/accelerometer/accelerometer_reader.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/accelerometer/accelerometer_reader.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 34 matching lines @@
 const size_t kTriggerDataValues =
     arraysize(kAccelerometerNames) * arraysize(kAccelerometerAxes);
 const size_t kTriggerDataLength = kTriggerDataValues * 2;
 
 // The length required to read uint values from configuration files.
 const size_t kMaxAsciiUintLength = 21;
 
 // The time to wait between reading the accelerometer.
 const int kDelayBetweenReadsMs = 100;
 
+// The mean acceleration due to gravity on Earth in m/s^2.
+const float kMeanGravity = 9.80665f;
+
 // Reads |path| to the unsigned int pointed to by |value|. Returns true on
 // success or false on failure.
 bool ReadFileToUint(const base::FilePath& path, unsigned int* value) {
   std::string s;
   DCHECK(value);
   if (!base::ReadFileToString(path, &s, kMaxAsciiUintLength)) {
     LOG(ERROR) << "Failed to read " << path.value();
     return false;
   }
   base::TrimWhitespaceASCII(s, base::TRIM_ALL, &s);
@@ skipping 123 matching lines @@
 }
 
 void AccelerometerReader::OnDataRead(
     scoped_refptr<AccelerometerReader::Reading> reading,
     bool success) {
   DCHECK(!task_runner_->RunsTasksOnCurrentThread());
 
   if (success) {
     gfx::Vector3dF base_reading, lid_reading;
     int16* values = reinterpret_cast<int16*>(reading->data);
-    base_reading.set_x(values[configuration_->data.index[0]]);
-    base_reading.set_y(values[configuration_->data.index[1]]);
-    base_reading.set_z(values[configuration_->data.index[2]]);
-    base_reading.Scale(1.0f / configuration_->data.base_scale);
-
-    lid_reading.set_x(values[configuration_->data.index[3]]);
-    lid_reading.set_y(values[configuration_->data.index[4]]);
-    lid_reading.set_z(values[configuration_->data.index[5]]);
-    lid_reading.Scale(1.0f / configuration_->data.lid_scale);
-    delegate_->HandleAccelerometerReading(base_reading, lid_reading);
+    float lid_scale = kMeanGravity / configuration_->data.lid_scale;
+    update_.Set(ui::ACCELEROMETER_SOURCE_SCREEN,
+                -values[configuration_->data.index[4]] * lid_scale,
+                values[configuration_->data.index[3]] * lid_scale,
+                values[configuration_->data.index[5]] * lid_scale);
+    float base_scale = kMeanGravity / configuration_->data.base_scale;
+    update_.Set(ui::ACCELEROMETER_SOURCE_ATTACHED_KEYBOARD,
+                -values[configuration_->data.index[1]] * base_scale,
+                -values[configuration_->data.index[0]] * base_scale,
+                -values[configuration_->data.index[2]] * base_scale);
+    delegate_->HandleAccelerometerUpdate(update_);
   }
 
   // Trigger another read after the current sampling delay.
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&AccelerometerReader::TriggerRead,
                  weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kDelayBetweenReadsMs));
 }
 
 }  // namespace chromeos