[M49_2623] Chromium upversion to m49_2623 branch.

[platform/framework/web/chromium-efl.git] / tizen_src / chromium_impl / content / browser / renderer_host / render_widget_host_view_efl.h

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
old mode 100755 (executable)
new mode 100644 (file)
index 0fcfdbb..b376727
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
@@ -11,7 +11,6 @@
 #include <Evas_GL.h>
 #include <Ecore_IMF_Evas.h>
 
-#include "base/basictypes.h"
 #include "base/format_macros.h"
 #include "base/id_map.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
@@ -177,14 +176,16 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
   void UnlockCompositingSurface() override;
 
   void OnSwapCompositorFrame(
-      uint32 output_surface_id, scoped_ptr<cc::CompositorFrame> frame) override;
+      uint32_t output_surface_id, scoped_ptr<cc::CompositorFrame> frame) override;
 
   void ClearCompositorFrame () override;
 
   // ui::GestureEventHelper implementation.
   bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override;
-  void DispatchCancelTouchEvent(ui::TouchEvent* event) override;
-  void DispatchGestureEvent(ui::GestureEvent*) override;
+  void DispatchCancelTouchEvent(ui::GestureConsumer* raw_input_consumer,
+                                ui::TouchEvent* event) override;
+  void DispatchGestureEvent(GestureConsumer* raw_input_consumer,
+                            ui::GestureEvent*) override;
 
   // IPC::Sender implementation:
   bool Send(IPC::Message*) override;