Index: content/browser/device_orientation/orientation_message_filter.cc |
diff --git a/content/browser/device_orientation/orientation_message_filter.cc b/content/browser/device_orientation/orientation_message_filter.cc |
index 254f48c92ff200a408f7085b97de0c4e5237e8a5..773f1e9f657e871c68cd617f1a10aa77785a37e1 100644 |
--- a/content/browser/device_orientation/orientation_message_filter.cc |
+++ b/content/browser/device_orientation/orientation_message_filter.cc |
@@ -21,44 +21,46 @@ 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 i
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_; |
@@ -74,7 +76,7 @@ void OrientationMessageFilter::ObserverDelegate::OnOrientationUpdate( |
} |
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) |
@@ -91,9 +93,8 @@ void OrientationMessageFilter::OnStartUpdating(int render_view_id) { |
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) { |