Implements part of Device Motion in the Renderer

content/browser/device_orientation/orientation_message_filter.cc

 // 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.
 
 #include "content/browser/device_orientation/orientation_message_filter.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/device_orientation/orientation.h"
 #include "content/browser/device_orientation/provider.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/device_orientation_messages.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace device_orientation {
 
 OrientationMessageFilter::OrientationMessageFilter() : provider_(NULL) {
 }
 
 OrientationMessageFilter::~OrientationMessageFilter() {
 }
 
-class OrientationMessageFilter::ObserverDelegate
-    : public base::RefCounted<ObserverDelegate>, public Provider::Observer {
+class OrientationMessageFilter::OrientationObserverDelegate
+    : public base::RefCounted<OrientationObserverDelegate>,
+      public Provider::OrientationObserver {
  public:
-    // Create ObserverDelegate that observes provider and forwards updates to
-    // render_view_id in process_id.
+    // Create OrientationObserverDelegate that observes provider and forwards
+    // updates to render_view_id in process_id.
     // Will stop observing provider when destructed.
-    ObserverDelegate(Provider* provider,
-                     int render_view_id,
-                     IPC::Sender* sender);
+    OrientationObserverDelegate(Provider* provider,
+                                int render_view_id,
+                                IPC::Sender* sender);
 
-    // From Provider::Observer.
+    // From Provider::OrientationObserver.
     virtual void OnOrientationUpdate(const Orientation& orientation);

[bulach, 2012/07/02 12:47:56]

nit: unrelated to your patch, but please fix the indentation from 28-36 (needs
-2).

[aousterh, 2012/07/04 13:31:55]

Done.

 
  private:
-  friend class base::RefCounted<ObserverDelegate>;
-  virtual ~ObserverDelegate();
+  friend class base::RefCounted<OrientationObserverDelegate>;
+  virtual ~OrientationObserverDelegate();
 
   scoped_refptr<Provider> provider_;
   int render_view_id_;
   IPC::Sender* sender_;  // Weak pointer.
 
-  DISALLOW_COPY_AND_ASSIGN(ObserverDelegate);
+  DISALLOW_COPY_AND_ASSIGN(OrientationObserverDelegate);
 };
 
-OrientationMessageFilter::ObserverDelegate::ObserverDelegate(Provider* provider,
-                                                  int render_view_id,
-                                                  IPC::Sender* sender)
+OrientationMessageFilter::OrientationObserverDelegate::
+OrientationObserverDelegate(Provider* provider, int render_view_id,
+                                IPC::Sender* sender)
     : provider_(provider),
       render_view_id_(render_view_id),
       sender_(sender) {
-  provider_->AddObserver(this);
+  provider_->AddOrientationObserver(this);
 }
 
-OrientationMessageFilter::ObserverDelegate::~ObserverDelegate() {
-  provider_->RemoveObserver(this);
+OrientationMessageFilter::OrientationObserverDelegate::
+    ~OrientationObserverDelegate() {
+  provider_->RemoveOrientationObserver(this);
 }
 
-void OrientationMessageFilter::ObserverDelegate::OnOrientationUpdate(
+void OrientationMessageFilter::OrientationObserverDelegate::OnOrientationUpdate(
     const Orientation& orientation) {
   DeviceOrientationMsg_Updated_Params params;
   params.can_provide_alpha = orientation.can_provide_alpha_;
   params.alpha = orientation.alpha_;
   params.can_provide_beta = orientation.can_provide_beta_;
   params.beta = orientation.beta_;
   params.can_provide_gamma = orientation.can_provide_gamma_;
   params.gamma = orientation.gamma_;
   params.can_provide_absolute = orientation.can_provide_absolute_;
   params.absolute = orientation.absolute_;
 
   sender_->Send(new DeviceOrientationMsg_Updated(render_view_id_, params));
 }
 
 bool OrientationMessageFilter::OnMessageReceived(const IPC::Message& message,
-                                      bool* message_was_ok) {
+                                                 bool* message_was_ok) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(OrientationMessageFilter, message, *message_was_ok)
     IPC_MESSAGE_HANDLER(DeviceOrientationHostMsg_StartUpdating, OnStartUpdating)
     IPC_MESSAGE_HANDLER(DeviceOrientationHostMsg_StopUpdating, OnStopUpdating)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void OrientationMessageFilter::OnStartUpdating(int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!provider_)
     provider_ = Provider::GetInstance();
 
-  observers_map_[render_view_id] = new ObserverDelegate(provider_,
-                                                        render_view_id,
-                                                        this);
+  observers_map_[render_view_id] = new OrientationObserverDelegate(provider_,
+    render_view_id, this);

[bulach, 2012/07/02 12:47:56]

nit: indent +2

[aousterh, 2012/07/04 13:31:55]

Done.

 }
 
 void OrientationMessageFilter::OnStopUpdating(int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   observers_map_.erase(render_view_id);
 }
 
 }  // namespace device_orientation