Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / views / controls / native / native_view_host.h

diff --git a/src/ui/views/controls/native/native_view_host.h b/src/ui/views/controls/native/native_view_host.h
index d5dd9b5..c6a8aba 100644 (file)
--- a/src/ui/views/controls/native/native_view_host.h
+++ b/src/ui/views/controls/native/native_view_host.h
@@ -11,8 +11,10 @@
 #include "ui/views/view.h"
 
 namespace views {
+namespace test {
+class NativeViewHostTestBase;
+}
 
-class NativeViewHostAuraTest;
 class NativeViewHostWrapper;
 
 // If a NativeViewHost's native view is a Widget, this native window
@@ -29,7 +31,7 @@ class VIEWS_EXPORT NativeViewHost : public View {
   static const char kViewClassName[];
 
   NativeViewHost();
-  virtual ~NativeViewHost();
+  ~NativeViewHost() override;
 
   // Attach a gfx::NativeView to this View. Its bounds will be kept in sync
   // with the bounds of this View until Detach is called.
@@ -47,16 +49,6 @@ class VIEWS_EXPORT NativeViewHost : public View {
   // Sets a preferred size for the native view attached to this View.
   void SetPreferredSize(const gfx::Size& size);
 
-  // A NativeViewHost has an associated focus View so that the focus of the
-  // native control and of the View are kept in sync. In simple cases where the
-  // NativeViewHost directly wraps a native window as is, the associated view
-  // is this View. In other cases where the NativeViewHost is part of another
-  // view (such as TextField), the actual View is not the NativeViewHost and
-  // this method must be called to set that.
-  // This method must be called before Attach().
-  void set_focus_view(View* view) { focus_view_ = view; }
-  View* focus_view() { return focus_view_; }
-
   // Fast resizing will move the native view and clip its visible region, this
   // will result in white areas and will not resize the content (so scrollbars
   // will be all wrong and content will flow offscreen). Only use this
@@ -77,23 +69,23 @@ class VIEWS_EXPORT NativeViewHost : public View {
   void NativeViewDestroyed();
 
   // Overridden from View:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual void Layout() OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
-  virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE;
-  virtual void OnFocus() OVERRIDE;
-  virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
-  virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE;
+  gfx::Size GetPreferredSize() const override;
+  void Layout() override;
+  void OnPaint(gfx::Canvas* canvas) override;
+  void VisibilityChanged(View* starting_from, bool is_visible) override;
+  void OnFocus() override;
+  gfx::NativeViewAccessible GetNativeViewAccessible() override;
+  gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override;
 
  protected:
-  virtual bool NeedsNotificationWhenVisibleBoundsChange() const OVERRIDE;
-  virtual void OnVisibleBoundsChanged() OVERRIDE;
-  virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE;
+  bool GetNeedsNotificationWhenVisibleBoundsChange() const override;
+  void OnVisibleBoundsChanged() override;
+  void ViewHierarchyChanged(
+      const ViewHierarchyChangedDetails& details) override;
+  const char* GetClassName() const override;
 
  private:
-  friend class NativeViewHostAuraTest;
+  friend class test::NativeViewHostTestBase;
 
   // Detach the native view. |destroyed| is true if the native view is
   // detached because it's being destroyed, or false otherwise.
@@ -121,9 +113,6 @@ class VIEWS_EXPORT NativeViewHost : public View {
   // Value of |fast_resize_| during the last call to Layout.
   bool fast_resize_at_last_layout_;
 
-  // The view that should be given focus when this NativeViewHost is focused.
-  View* focus_view_;
-
   DISALLOW_COPY_AND_ASSIGN(NativeViewHost);
 };