Reverting 27113.

views/controls/native/native_view_host.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_CONTROLS_NATIVE_VIEW_HOST_H_
 #define VIEWS_CONTROLS_NATIVE_VIEW_HOST_H_
 
 #include <string>
 
 #include "views/view.h"
@@ skipping 24 matching lines @@
   // added to a View hierarchy hosted within a valid Widget.
   void Attach(gfx::NativeView native_view);
 
   // Detach the attached window handle. Its bounds and visibility will no longer
   // be manipulated by this View.
   void Detach();
 
   // Sets a preferred size for the native view attached to this View.
   void SetPreferredSize(const gfx::Size& size);
 
-  // A NativeViewHost must keep the focused view in the focus manager and the
-  // native focus with in sync . There are 2 aspects to this:
-  // - when the native view receives focus, the focus manager must be notified
-  //   that the associated view is now the focused view.
-  //   In simple cases where the NativeViewHost directly wraps a native window
-  //   as is, the associated view is this NativeViewHost. In other cases where
-  //   the NativeViewHost is part of another view (such as for the TextField
-  //   class), the actual View is not the NativeViewHost and set_focus_view()
-  //   must be called to set the associated view before Attach() is called.
-  // - when the view is focused (by calling View::RequestFocus()), it must focus
-  //   the appropriate native view.  In simple cases where the native view does
-  //   not have children or is the native view that should really get the focus,
-  //   this works without doing anything.  In case where the native view that
-  //   should get the focus is not the native view passed to Attach(), then
-  //   the appropriate native view should be specified to
-  //   set_focus_native_view() before Attach() is called.
+  // 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; }
-  void set_focus_native_view(gfx::NativeView native_view) {
-    focus_native_view_ = native_view;
-  }
-  gfx::NativeView focus_native_view() const { return focus_native_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
   // when you're doing extremely quick, high-framerate vertical resizes
   // and don't care about accuracy. Make sure you do a real resize at the
   // end. USE WITH CAUTION.
   void set_fast_resize(bool fast_resize) { fast_resize_ = fast_resize; }
   bool fast_resize() const { return fast_resize_; }
 
   // Accessor for |native_view_|.
   gfx::NativeView native_view() const { return native_view_; }
 
-  // Called by the NativeViewHostWrapper to notify that the |focus_native_view_|
-  // got focus.
-  void GotNativeFocus();
-
   void NativeViewDestroyed();
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize();
   virtual void Layout();
   virtual void Paint(gfx::Canvas* canvas);
   virtual void VisibilityChanged(View* starting_from, bool is_visible);
   virtual void Focus();
 
  protected:
@@ skipping 12 matching lines @@
   // The preferred size of this View
   gfx::Size preferred_size_;
 
   // True if the native view is being resized using the fast method described
   // in the setter/accessor above.
   bool fast_resize_;
 
   // The view that should be given focus when this NativeViewHost is focused.
   View* focus_view_;
 
-  // The native view that should get the focus when this View gets focused.
-  gfx::NativeView focus_native_view_;
-
   DISALLOW_COPY_AND_ASSIGN(NativeViewHost);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_NATIVE_VIEW_HOST_H_