Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / views / widget / native_widget_private.h

diff --git a/src/ui/views/widget/native_widget_private.h b/src/ui/views/widget/native_widget_private.h
index ccb15b9..3c6f370 100644 (file)
--- a/src/ui/views/widget/native_widget_private.h
+++ b/src/ui/views/widget/native_widget_private.h
@@ -44,7 +44,7 @@ class InputMethodDelegate;
 //
 class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget {
  public:
-  virtual ~NativeWidgetPrivate() {}
+  ~NativeWidgetPrivate() override {}
 
   // Creates an appropriate default NativeWidgetPrivate implementation for the
   // current OS/circumstance.
@@ -99,10 +99,9 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget {
   // Returns the Compositor, or NULL if there isn't one associated with this
   // NativeWidget.
   virtual const ui::Compositor* GetCompositor() const = 0;
-  virtual ui::Compositor* GetCompositor() = 0;
 
   // Returns the NativeWidget's layer, if any.
-  virtual ui::Layer* GetLayer() = 0;
+  virtual const ui::Layer* GetLayer() const = 0;
 
   // Reorders the widget's child NativeViews which are associated to the view
   // tree (eg via a NativeViewHost) to match the z-order of the views in the
@@ -222,6 +221,10 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget {
       Widget::MoveLoopEscapeBehavior escape_behavior) = 0;
   virtual void EndMoveLoop() = 0;
   virtual void SetVisibilityChangedAnimationsEnabled(bool value) = 0;
+  virtual void SetVisibilityAnimationDuration(
+      const base::TimeDelta& duration) = 0;
+  virtual void SetVisibilityAnimationTransition(
+      Widget::VisibilityTransition transition) = 0;
   virtual ui::NativeTheme* GetNativeTheme() const = 0;
   virtual void OnRootViewLayout() = 0;
   virtual bool IsTranslucentWindowOpacitySupported() const = 0;
@@ -231,7 +234,7 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget {
   virtual void RepostNativeEvent(gfx::NativeEvent native_event) = 0;
 
   // Overridden from NativeWidget:
-  virtual internal::NativeWidgetPrivate* AsNativeWidgetPrivate() OVERRIDE;
+  internal::NativeWidgetPrivate* AsNativeWidgetPrivate() override;
 };
 
 }  // namespace internal