| Index: mojo/services/native_viewport/native_viewport_service.cc
|
| diff --git a/mojo/services/native_viewport/native_viewport_service.cc b/mojo/services/native_viewport/native_viewport_service.cc
|
| index 9b63c487b31873366d429577dad44d7a307b3d63..1db489b8375382e7f202a9674425047aa89350f3 100644
|
| --- a/mojo/services/native_viewport/native_viewport_service.cc
|
| +++ b/mojo/services/native_viewport/native_viewport_service.cc
|
| @@ -27,7 +27,7 @@ bool IsRateLimitedEventType(ui::Event* event) {
|
| event->type() == ui::ET_TOUCH_MOVED;
|
| }
|
|
|
| -}
|
| +} // namespace
|
|
|
| class NativeViewportImpl
|
| : public InterfaceImpl<mojo::NativeViewport>,
|
| @@ -102,16 +102,16 @@ class NativeViewportImpl
|
| virtual bool OnEvent(ui::Event* ui_event) OVERRIDE {
|
| // Must not return early before updating capture.
|
| switch (ui_event->type()) {
|
| - case ui::ET_MOUSE_PRESSED:
|
| - case ui::ET_TOUCH_PRESSED:
|
| - native_viewport_->SetCapture();
|
| - break;
|
| - case ui::ET_MOUSE_RELEASED:
|
| - case ui::ET_TOUCH_RELEASED:
|
| - native_viewport_->ReleaseCapture();
|
| - break;
|
| - default:
|
| - break;
|
| + case ui::ET_MOUSE_PRESSED:
|
| + case ui::ET_TOUCH_PRESSED:
|
| + native_viewport_->SetCapture();
|
| + break;
|
| + case ui::ET_MOUSE_RELEASED:
|
| + case ui::ET_TOUCH_RELEASED:
|
| + native_viewport_->ReleaseCapture();
|
| + break;
|
| + default:
|
| + break;
|
| }
|
|
|
| if (waiting_for_event_ack_ && IsRateLimitedEventType(ui_event))
|
| @@ -167,11 +167,9 @@ class NVSDelegate : public ApplicationDelegate {
|
| mojo::shell::Context* context_;
|
| };
|
|
|
| -
|
| } // namespace services
|
| } // namespace mojo
|
|
|
| -
|
| MOJO_NATIVE_VIEWPORT_EXPORT mojo::ApplicationImpl*
|
| CreateNativeViewportService(
|
| mojo::shell::Context* context,
|
|
|