Fix the build on eLinux

Update ozone layer to the new snapshot, update the
embedded_linux.pri configuration, fix the GLSurfaceQt
build on non-x11 linux and update embedded command line
switches for the 40.0.2214-based chromium snapshot.

This patch also updates the snapshot sha1 to include
required chromium changes.

Change-Id: I7f9446fa1b67a0af7baee564acff41ae33ff1a94
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 17 insertions, 11 deletions

diff --git a/src/core/ozone_platform_eglfs.h b/src/core/ozone_platform_eglfs.h
index 07b9bf441..2371bb1e8 100644
--- a/src/core/ozone_platform_eglfs.h
+++ b/src/core/ozone_platform_eglfs.h
@@ -39,32 +39,38 @@
 
 #if defined(USE_OZONE)
 
-#include "ui/events/ozone/evdev/event_factory_evdev.h"
-#include "ui/ozone/ozone_platform.h"
+#include "ui/ozone/public/ozone_platform.h"
 
 #include "surface_factory_qt.h"
 
 namespace ui {
 
+class DeviceManager;
+class EventFactoryEvdev;
+class CursorFactoryOzone;
+
 class OzonePlatformEglfs : public OzonePlatform {
  public:
   OzonePlatformEglfs();
   virtual ~OzonePlatformEglfs();
 
-  virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() OVERRIDE;
-  virtual ui::EventFactoryOzone* GetEventFactoryOzone() OVERRIDE;
-  virtual ui::CursorFactoryOzone* GetCursorFactoryOzone() OVERRIDE;
-  virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE;
-  virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE;
-  virtual void InitializeUI() OVERRIDE;
-  virtual void InitializeGPU() OVERRIDE;
+  virtual ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override;
+  virtual ui::CursorFactoryOzone* GetCursorFactoryOzone() override;
+  virtual GpuPlatformSupport* GetGpuPlatformSupport() override;
+  virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() override;
+  virtual scoped_ptr<PlatformWindow> CreatePlatformWindow(
+      PlatformWindowDelegate* delegate,
+      const gfx::Rect& bounds) override;
+  virtual scoped_ptr<ui::NativeDisplayDelegate> CreateNativeDisplayDelegate() override;
 
  private:
+  virtual void InitializeUI() override;
+  virtual void InitializeGPU() override;
   scoped_ptr<DeviceManager> device_manager_;
 
   scoped_ptr<SurfaceFactoryQt> surface_factory_ozone_;
-  scoped_ptr<ui::CursorFactoryOzone> cursor_factory_ozone_;
-  scoped_ptr<ui::EventFactoryEvdev> event_factory_ozone_;
+  scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
+  scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
 
   scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
   scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;