summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-19 21:06:05 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-19 21:06:05 +0000
commit875290e64cfd2d632fc5cac46c67f37992ed935d (patch)
tree6f7e971cd2f38e9a0facad91197e7d6753442a94 /content
parent7b55ab231f2d9f3e04a8fa668f7e41e45ecc1810 (diff)
downloadchromium_src-875290e64cfd2d632fc5cac46c67f37992ed935d.zip
chromium_src-875290e64cfd2d632fc5cac46c67f37992ed935d.tar.gz
chromium_src-875290e64cfd2d632fc5cac46c67f37992ed935d.tar.bz2
Revert 93094 - Initial sensor event provider for testing views screen rotation
The sensors API will unify various types of sensor data into a set of channels, each of which provides change events and periodic updates. This version of the API is intended only to support the experimental screen rotation code and is not for general use. In particular, the final listener will declare generic |OnSensorChange| and |OnSensorUpdate| methods, rather than the special-purpose |OnScreenOrientationChange|. BUG=none TEST=manual with http://codereview.chromium.org/7273073/ Review URL: http://codereview.chromium.org/7366011 TBR=cwolfe@chromium.org Review URL: http://codereview.chromium.org/7455002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/sensors/provider.cc20
-rw-r--r--content/browser/sensors/provider.h56
-rw-r--r--content/browser/sensors/provider_impl.cc35
-rw-r--r--content/browser/sensors/provider_impl.h44
-rw-r--r--content/common/sensors.h29
-rw-r--r--content/common/sensors_listener.h36
-rw-r--r--content/content_browser.gypi4
-rw-r--r--content/content_common.gypi2
8 files changed, 0 insertions, 226 deletions
diff --git a/content/browser/sensors/provider.cc b/content/browser/sensors/provider.cc
deleted file mode 100644
index 431e836..0000000
--- a/content/browser/sensors/provider.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2011 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 "content/browser/sensors/provider.h"
-#include "content/browser/sensors/provider_impl.h"
-
-namespace sensors {
-
-Provider* Provider::GetInstance() {
- return ProviderImpl::GetInstance();
-}
-
-Provider::Provider() {
-}
-
-Provider::~Provider() {
-}
-
-} // sensors
diff --git a/content/browser/sensors/provider.h b/content/browser/sensors/provider.h
deleted file mode 100644
index d2c204d..0000000
--- a/content/browser/sensors/provider.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef CONTENT_BROWSER_SENSORS_PROVIDER_H_
-#define CONTENT_BROWSER_SENSORS_PROVIDER_H_
-#pragma once
-
-#include "content/common/sensors_listener.h"
-
-namespace sensors {
-
-// The sensors API will unify various types of sensor data into a set of
-// channels, each of which provides change events and periodic updates.
-//
-// This version of the API is intended only to support the experimental screen
-// rotation code and is not for general use. In particular, the final listener
-// will declare generic |OnSensorChanged| and |OnSensorUpdated| methods, rather
-// than the special-purpose |OnScreenOrientationChanged|.
-//
-// TODO(cwolfe): Finish defining the initial set of channels and replace this
-// with the generic sensor provider.
-//
-class Provider {
- public:
- static Provider* GetInstance();
-
- // Adds a sensor listener. The listener will receive callbacks to indicate
- // sensor changes and updates until it is removed.
- //
- // This method may be called in any thread. Callbacks on a listener will
- // always be executed in the thread which added that listener.
- virtual void AddListener(Listener* listener) = 0;
-
- // Removes a sensor listener.
- //
- // This method must be called in the same thread which added the listener.
- // If the listener is not currently subscribed, this method may be called in
- // any thread.
- virtual void RemoveListener(Listener* listener) = 0;
-
- // Broadcasts a change to the coarse screen orientation.
- //
- // This method may be called in any thread.
- virtual void ScreenOrientationChanged(const ScreenOrientation& change) = 0;
-
- protected:
- Provider();
- virtual ~Provider();
-
- DISALLOW_COPY_AND_ASSIGN(Provider);
-};
-
-} // namespace sensors
-
-#endif // CONTENT_BROWSER_SENSORS_PROVIDER_H_
diff --git a/content/browser/sensors/provider_impl.cc b/content/browser/sensors/provider_impl.cc
deleted file mode 100644
index b7b4ffe..0000000
--- a/content/browser/sensors/provider_impl.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2011 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 "base/logging.h"
-#include "base/memory/singleton.h"
-#include "content/browser/sensors/provider_impl.h"
-
-namespace sensors {
-
-ProviderImpl* ProviderImpl::GetInstance() {
- return Singleton<ProviderImpl>::get();
-}
-
-ProviderImpl::ProviderImpl()
- : listeners_(new ListenerList()) {
-}
-
-ProviderImpl::~ProviderImpl() {
-}
-
-void ProviderImpl::AddListener(Listener* listener) {
- listeners_->AddObserver(listener);
-}
-
-void ProviderImpl::RemoveListener(Listener* listener) {
- listeners_->RemoveObserver(listener);
-}
-
-void ProviderImpl::ScreenOrientationChanged(
- const ScreenOrientation& change) {
- listeners_->Notify(&Listener::OnScreenOrientationChanged, change);
-}
-
-} // namespace sensors
diff --git a/content/browser/sensors/provider_impl.h b/content/browser/sensors/provider_impl.h
deleted file mode 100644
index eb8e271..0000000
--- a/content/browser/sensors/provider_impl.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef CONTENT_BROWSER_SENSORS_PROVIDER_IMPL_H_
-#define CONTENT_BROWSER_SENSORS_PROVIDER_IMPL_H_
-#pragma once
-
-#include "base/memory/ref_counted.h"
-#include "base/observer_list_threadsafe.h"
-#include "base/task.h"
-#include "content/browser/sensors/provider.h"
-
-template <typename T>
-struct DefaultSingletonTraits;
-
-namespace sensors {
-
-class ProviderImpl : public Provider {
- public:
- static ProviderImpl* GetInstance();
-
- // Provider implementation
- virtual void AddListener(Listener* listener);
- virtual void RemoveListener(Listener* listener);
- virtual void ScreenOrientationChanged(const ScreenOrientation& change);
-
- private:
- friend struct DefaultSingletonTraits<ProviderImpl>;
-
- ProviderImpl();
- virtual ~ProviderImpl();
-
- typedef ObserverListThreadSafe<Listener> ListenerList;
- scoped_refptr<ListenerList> listeners_;
-
- DISALLOW_COPY_AND_ASSIGN(ProviderImpl);
-};
-
-} // namespace sensors
-
-DISABLE_RUNNABLE_METHOD_REFCOUNT(sensors::ProviderImpl);
-
-#endif // CONTENT_BROWSER_SENSORS_PROVIDER_IMPL_H_
diff --git a/content/common/sensors.h b/content/common/sensors.h
deleted file mode 100644
index 26beb12..0000000
--- a/content/common/sensors.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef CONTENT_COMMON_SENSORS_H_
-#define CONTENT_COMMON_SENSORS_H_
-#pragma once
-
-namespace sensors {
-
-// Indicates the coarse orientation of the device.
-struct ScreenOrientation {
- enum Side {
- TOP = 0, // The screen is in its normal orientation.
- BOTTOM = 1, // The screen is upside-down (180-degree rotation).
- LEFT = 2, // The right side of the screen is at the top.
- RIGHT = 3, // The left side of the screen is at the top.
- FRONT = 4, // The screen is laid flat, facing upward.
- BACK = 5, // The screen is laid flat, facing downward.
- };
-
- // The side of the device which the user probably perceives as facing upward.
- // This can be used to orient controls and content in a "natural" direction.
- Side upward;
-};
-
-} // namespace sensors
-
-#endif // CONTENT_COMMON_SENSORS_H_
diff --git a/content/common/sensors_listener.h b/content/common/sensors_listener.h
deleted file mode 100644
index a2fe5e0..0000000
--- a/content/common/sensors_listener.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) 2011 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.
-
-#ifndef CONTENT_COMMON_SENSORS_LISTENER_H_
-#define CONTENT_COMMON_SENSORS_LISTENER_H_
-#pragma once
-
-#include "base/basictypes.h"
-#include "content/common/sensors.h"
-
-namespace sensors {
-
-// The sensors API will unify various types of sensor data into a set of
-// channels, each of which provides change events and periodic updates.
-//
-// This version of the API is intended only to support the experimental screen
-// rotation code and is not for general use. In particular, the final listener
-// will declare generic |OnSensorChanged| and |OnSensorUpdated| methods, rather
-// than the special-purpose |OnScreenOrientationChanged|.
-//
-class Listener {
- public:
- // Called whenever the coarse orientation of the device changes.
- virtual void OnScreenOrientationChanged(const ScreenOrientation& change) = 0;
-
- protected:
- Listener() {}
- virtual ~Listener() {}
-
- DISALLOW_COPY_AND_ASSIGN(Listener);
-};
-
-} // namespace sensors
-
-#endif // CONTENT_COMMON_SENSORS_LISTENER_H_
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 868ea58..67e5a17 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -374,10 +374,6 @@
'browser/resource_context.h',
'browser/safe_util_win.cc',
'browser/safe_util_win.h',
- 'browser/sensors/provider.cc',
- 'browser/sensors/provider.h',
- 'browser/sensors/provider_impl.cc',
- 'browser/sensors/provider_impl.h',
'browser/site_instance.cc',
'browser/site_instance.h',
'browser/speech/audio_encoder.cc',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 638b5db..42cfd32 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -210,8 +210,6 @@
'common/section_util_win.cc',
'common/section_util_win.h',
'common/security_style.h',
- 'common/sensors.h',
- 'common/sensors_listener.h',
'common/serialized_script_value.cc',
'common/serialized_script_value.h',
'common/set_process_title.cc',