Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ozone / wayland / display.h

diff --git a/src/ozone/wayland/display.h b/src/ozone/wayland/display.h
index 6490622..a75542b 100644 (file)
--- a/src/ozone/wayland/display.h
+++ b/src/ozone/wayland/display.h
@@ -77,32 +77,29 @@ class WaylandDisplay : public ui::WindowStateChangeHandler,
   bool InitializeHardware();
 
   // Ozone Display implementation:
-  virtual intptr_t GetNativeDisplay() OVERRIDE;
+  intptr_t GetNativeDisplay() override;
 
   // Ownership is passed to the caller.
-  virtual scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
-        gfx::AcceleratedWidget widget) OVERRIDE;
+  scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
+      gfx::AcceleratedWidget widget) override;
 
-  virtual bool LoadEGLGLES2Bindings(
-    ui::SurfaceFactoryOzone::AddGLLibraryCallback add_gl_library,
-    ui::SurfaceFactoryOzone::SetGLGetProcAddressProcCallback
-        proc_address) OVERRIDE;
-  virtual const int32* GetEGLSurfaceProperties(
-      const int32* desired_list) OVERRIDE;
+  bool LoadEGLGLES2Bindings(
+      ui::SurfaceFactoryOzone::AddGLLibraryCallback add_gl_library,
+      ui::SurfaceFactoryOzone::SetGLGetProcAddressProcCallback
+      proc_address) override;
+  const int32* GetEGLSurfaceProperties(const int32* desired_list) override;
 
   // WindowStateChangeHandler implementation:
-  virtual void SetWidgetState(unsigned widget,
-                              ui::WidgetState state,
-                              unsigned width = 0,
-                              unsigned height = 0) OVERRIDE;
-  virtual void SetWidgetTitle(unsigned w,
-                              const base::string16& title) OVERRIDE;
-  virtual void SetWidgetCursor(int cursor_type) OVERRIDE;
-  virtual void SetWidgetAttributes(unsigned widget,
-                                   unsigned parent,
-                                   unsigned x,
-                                   unsigned y,
-                                   ui::WidgetType type) OVERRIDE;
+  void SetWidgetState(unsigned widget,
+                      ui::WidgetState state) override;
+  void SetWidgetTitle(unsigned w,
+                      const base::string16& title) override;
+  void SetWidgetCursor(int cursor_type) override;
+  void CreateWidget(unsigned widget,
+                    unsigned parent,
+                    unsigned x,
+                    unsigned y,
+                    ui::WidgetType type) override;
 
   void LookAheadOutputGeometry();