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

Unified Diff: content/browser/device_orientation/accelerometer_mac.h

Issue 9844020: Move the Sudden Motion Sensor library into third_party. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DEPS: convert line endings Created 8 years, 9 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 | « content/browser/device_orientation/DEPS ('k') | content/browser/device_orientation/accelerometer_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/device_orientation/accelerometer_mac.h
diff --git a/content/browser/device_orientation/accelerometer_mac.h b/content/browser/device_orientation/accelerometer_mac.h
index 853b4d5b03cde3589036438bca5430a2120b0495..4413dd07898ad103553aa2d10c62b362a135f133 100644
--- a/content/browser/device_orientation/accelerometer_mac.h
+++ b/content/browser/device_orientation/accelerometer_mac.h
@@ -1,52 +1,6 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
-//
-// This file is based on the SMSLib library.
-//
-// SMSLib Sudden Motion Sensor Access Library
-// Copyright (c) 2010 Suitable Systems
-// All rights reserved.
-//
-// Developed by: Daniel Griscom
-// Suitable Systems
-// http://www.suitable.com
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal with the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// - Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimers.
-//
-// - Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimers in the
-// documentation and/or other materials provided with the distribution.
-//
-// - Neither the names of Suitable Systems nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this Software without specific prior written permission.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-// IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-// ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-// SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
-//
-// For more information about SMSLib, see
-// <http://www.suitable.com/tools/smslib.html>
-// or contact
-// Daniel Griscom
-// Suitable Systems
-// 1 Centre Street, Suite 204
-// Wakefield, MA 01880
-// (781) 665-0053
#ifndef CONTENT_BROWSER_DEVICE_ORIENTATION_ACCELEROMETER_MAC_H_
#define CONTENT_BROWSER_DEVICE_ORIENTATION_ACCELEROMETER_MAC_H_
@@ -54,15 +8,14 @@
#include <vector>
-#include <IOKit/IOKitLib.h>
-
#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
#include "content/browser/device_orientation/data_fetcher.h"
+class SuddenMotionSensor;
+
namespace device_orientation {
-// Provides an easy-to-use interface to retrieve data
-// from the MacBook family accelerometer.
class AccelerometerMac : public DataFetcher {
public:
static DataFetcher* Create();
@@ -76,28 +29,7 @@ class AccelerometerMac : public DataFetcher {
AccelerometerMac();
bool Init();
- // Extend the sign of an integer of size bytes to a 32-bit one.
- static int ExtendSign(int value, size_t size);
-
- struct GenericMacbookSensor;
- struct SensorDescriptor;
- struct AxisData;
-
- // Generic sensor data and list of supported sensors.
- static const GenericMacbookSensor kGenericSensor;
- static const SensorDescriptor kSupportedSensors[];
-
- // Local sensor if supported, else NULL.
- const SensorDescriptor* sensor_;
-
- // IOKit connection to the local sensor.
- io_connect_t io_connection_;
-
- // Input memory used for sensor I/O.
- std::vector<char> input_record_;
-
- // Output memory used for sensor I/O.
- std::vector<char> output_record_;
+ scoped_ptr<SuddenMotionSensor> sudden_motion_sensor_;
};
} // namespace device_orientation
« no previous file with comments | « content/browser/device_orientation/DEPS ('k') | content/browser/device_orientation/accelerometer_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698