views: Get rid of TableView2::CreateWrapper().

This is called only once, better to inline it in the call site, less code.

R=sky@chromium.org

Review URL: http://codereview.chromium.org/7983050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102300 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 15 deletions

diff --git a/views/controls/table/table_view2.cc b/views/controls/table/table_view2.cc
index e387066..d3e28e5 100644
--- a/views/controls/table/table_view2.cc
+++ b/views/controls/table/table_view2.cc
@@ -11,8 +11,6 @@
 
 namespace views {
 
-// TableView2 ------------------------------------------------------------------
-
 TableView2::TableView2(ui::TableModel* model,
                        const std::vector<ui::TableColumn>& columns,
                        TableTypes table_type,
@@ -308,7 +306,7 @@ void TableView2::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
   if (is_add && !native_wrapper_ && GetWidget()) {
     // The native wrapper's lifetime will be managed by the view hierarchy after
     // we call AddChildView.
-    native_wrapper_ = CreateWrapper();
+    native_wrapper_ = NativeTableWrapper::CreateNativeWrapper(this);
     AddChildView(native_wrapper_->GetView());
   }
 }
@@ -333,11 +331,4 @@ ui::TableColumn TableView2::GetVisibleColumnAt(int index) {
   return iter->second;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NativeTable2, protected:
-
-NativeTableWrapper* TableView2::CreateWrapper() {
-  return NativeTableWrapper::CreateNativeWrapper(this);
-}
-
 }  // namespace views
diff --git a/views/controls/table/table_view2.h b/views/controls/table/table_view2.h
index 600bf52..58f5c0b 100644
--- a/views/controls/table/table_view2.h
+++ b/views/controls/table/table_view2.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/gfx/canvas.h"
@@ -17,8 +18,6 @@
 #include "views/controls/table/table_view.h"
 #include "views/view.h"
 
-class SkBitmap;
-
 namespace ui {
 struct TableColumn;
 class TableModel;
@@ -198,8 +197,9 @@ class VIEWS_EXPORT TableView2 : public View, public ui::TableModelObserver {
   virtual gfx::NativeView GetTestingHandle();
 
  protected:
-  virtual NativeTableWrapper* CreateWrapper();
-  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
+  virtual void ViewHierarchyChanged(bool is_add,
+                                    View* parent,
+                                    View* child) OVERRIDE;
 
  private:
   friend class ListViewParent;
@@ -213,7 +213,7 @@ class VIEWS_EXPORT TableView2 : public View, public ui::TableModelObserver {
   // cast from GetWindowLongPtr would break the pointer if it is pointing to a
   // subclass (in the OO sense of TableView).
   struct TableViewWrapper {
-    explicit TableViewWrapper(TableView2* view) : table_view(view) { }
+    explicit TableViewWrapper(TableView2* view) : table_view(view) {}
     TableView2* table_view;
   };