Now that we are doing a hard-cut-over to Aura, remove a bunch of *Views based classes that are ob...

views/controls/native/native_view_host.cc

 // Copyright (c) 2011 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.
 
 #include "views/controls/native/native_view_host.h"
 
 #include "base/logging.h"
 #include "ui/gfx/canvas.h"
-#include "views/controls/native/native_view_host_views.h"
 #include "views/controls/native/native_view_host_wrapper.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 // static
 const char NativeViewHost::kViewClassName[] = "views/NativeViewHost";
 
 #if defined(OS_LINUX)
 // GTK renders the focus.
 // static
 const bool NativeViewHost::kRenderNativeControlFocus = false;
 #else
 // static
 const bool NativeViewHost::kRenderNativeControlFocus = true;
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHost, public:
 
 NativeViewHost::NativeViewHost()
     : native_view_(NULL),
-      views_view_(NULL),
       fast_resize_(false),
       fast_resize_at_last_layout_(false),
       focus_view_(NULL) {
 }
 
 NativeViewHost::~NativeViewHost() {
 }
 
 void NativeViewHost::Attach(gfx::NativeView native_view) {
   DCHECK(native_view);
   DCHECK(!native_view_);
-  DCHECK(!views_view_);
   native_view_ = native_view;
   // If set_focus_view() has not been invoked, this view is the one that should
   // be seen as focused when the native view receives focus.
   if (!focus_view_)
     focus_view_ = this;
   native_wrapper_->NativeViewAttached();
 }
 
-void NativeViewHost::AttachToView(View* view) {
-  if (view == views_view_)
-    return;
-  DCHECK(view);
-  DCHECK(!native_view_);
-  DCHECK(!views_view_);
-  native_wrapper_.reset(new NativeViewHostViews(this));
-  views_view_ = view;
-  // If set_focus_view() has not been invoked, this view is the one that should
-  // be seen as focused when the native view receives focus.
-  if (!focus_view_)
-    focus_view_ = this;
-  native_wrapper_->NativeViewAttached();
-}
-
 void NativeViewHost::Detach() {
   Detach(false);
 }
 
 void NativeViewHost::SetPreferredSize(const gfx::Size& size) {
   preferred_size_ = size;
   PreferredSizeChanged();
 }
 
 void NativeViewHost::NativeViewDestroyed() {
   // Detach so we can clear our state and notify the native_wrapper_ to release
   // ref on the native view.
   Detach(true);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHost, View overrides:
 
 gfx::Size NativeViewHost::GetPreferredSize() {
   return preferred_size_;
 }
 
 void NativeViewHost::Layout() {
-  if ((!native_view_ && !views_view_) || !native_wrapper_.get())
+  if (!native_view_ || !native_wrapper_.get())
     return;
 
   gfx::Rect vis_bounds = GetVisibleBounds();
   bool visible = !vis_bounds.IsEmpty();
 
   if (visible && !fast_resize_) {
     if (vis_bounds.size() != size()) {
       // Only a portion of the Widget is really visible.
       int x = vis_bounds.x();
       int y = vis_bounds.y();
@@ skipping 88 matching lines @@
       return accessible_view;
   }
 
   return View::GetNativeViewAccessible();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHost, private:
 
 void NativeViewHost::Detach(bool destroyed) {
-  if (native_view_ || views_view_) {
+  if (native_view_) {
     native_wrapper_->NativeViewDetaching(destroyed);
     native_view_ = NULL;
-    views_view_ = NULL;
   }
 }
 
 }  // namespace views