Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / browser / ui / native_app_window_tizen.h

diff --git a/src/xwalk/runtime/browser/ui/native_app_window_tizen.h b/src/xwalk/runtime/browser/ui/native_app_window_tizen.h
index e671692..cd1cb32 100644 (file)
--- a/src/xwalk/runtime/browser/ui/native_app_window_tizen.h
+++ b/src/xwalk/runtime/browser/ui/native_app_window_tizen.h
@@ -5,27 +5,32 @@
 #ifndef XWALK_RUNTIME_BROWSER_UI_NATIVE_APP_WINDOW_TIZEN_H_
 #define XWALK_RUNTIME_BROWSER_UI_NATIVE_APP_WINDOW_TIZEN_H_
 
+#include "base/memory/scoped_ptr.h"
+#include "third_party/WebKit/public/platform/WebScreenOrientationLockType.h"
+#include "ui/aura/window_observer.h"
 #include "xwalk/runtime/browser/ui/screen_orientation.h"
 #include "xwalk/runtime/browser/ui/native_app_window_views.h"
 #include "xwalk/tizen/mobile/sensor/sensor_provider.h"
 #include "xwalk/tizen/mobile/ui/tizen_system_indicator_widget.h"
 #include "xwalk/tizen/mobile/ui/widget_container_view.h"
-#include "ui/aura/window_observer.h"
-#include "content/browser/screen_orientation/screen_orientation_provider.h"
 
 namespace xwalk {
 
+class SplashScreenTizen;
+
 // Tizen uses the Views native window but adds its own features like orientation
 // handling and integration with system indicator bar.
 class NativeAppWindowTizen
     : public aura::WindowObserver,
       public NativeAppWindowViews,
-      public SensorProvider::Observer,
-      public content::ScreenOrientationProvider {
+      public SensorProvider::Observer {
  public:
   explicit NativeAppWindowTizen(const NativeAppWindow::CreateParams& params);
   virtual ~NativeAppWindowTizen();
 
+  void LockOrientation(
+      blink::WebScreenOrientationLockType orientations);
+
  private:
   blink::WebScreenOrientationType FindNearestAllowedOrientation(
       blink::WebScreenOrientationType orientation) const;
@@ -33,29 +38,25 @@ class NativeAppWindowTizen
   void SetDisplayRotation(gfx::Display);
 
   // SensorProvider::Observer overrides:
-  virtual void OnScreenOrientationChanged(
-      blink::WebScreenOrientationType orientation) OVERRIDE;
-
-  // content::ScreenOrientationProvider overrides:
-  virtual void LockOrientation(
-      blink::WebScreenOrientationLockType orientations) OVERRIDE;
-  virtual void UnlockOrientation() OVERRIDE;
+  void OnScreenOrientationChanged(
+      blink::WebScreenOrientationType orientation) override;
+  void OnSensorConnected() override;
 
   // NativeAppWindowViews overrides:
-  virtual void Initialize() OVERRIDE;
+  void Initialize() override;
 
   // WindowObserver overrides:
-  virtual void OnWindowVisibilityChanging(
-      aura::Window* window, bool visible) OVERRIDE;
-  virtual void OnWindowBoundsChanged(
+  void OnWindowVisibilityChanging(
+      aura::Window* window, bool visible) override;
+  void OnWindowBoundsChanged(
       aura::Window* window,
       const gfx::Rect& old_bounds,
-      const gfx::Rect& new_bounds) OVERRIDE;
-  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
+      const gfx::Rect& new_bounds) override;
+  void OnWindowDestroying(aura::Window* window) override;
 
   // views::View overrides:
-  virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE;
+  void ViewHierarchyChanged(
+      const ViewHierarchyChangedDetails& details) override;
 
 #if defined(OS_TIZEN_MOBILE)
   // The system indicator is implemented as a widget because it needs to
@@ -70,10 +71,15 @@ class NativeAppWindowTizen
 
   gfx::Display display_;
   blink::WebScreenOrientationLockType orientation_lock_;
+  scoped_ptr<SplashScreenTizen> splash_screen_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowTizen);
 };
 
+inline NativeAppWindowTizen* ToNativeAppWindowTizen(NativeAppWindow* window) {
+  return static_cast<NativeAppWindowTizen*>(window);
+}
+
 }  // namespace xwalk
 
 #endif  // XWALK_RUNTIME_BROWSER_UI_NATIVE_APP_WINDOW_TIZEN_H_