| Index: views/controls/table/table_view2.h
|
| diff --git a/views/controls/table/table_view2.h b/views/controls/table/table_view2.h
|
| index 600bf5277f635eaa91bb9540f2501681df2718b0..58f5c0b0a8c0450aa6336ad28f47e36f16853f86 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;
|
| };
|
|
|
|
|