diff options
Diffstat (limited to 'chrome/views')
| -rw-r--r-- | chrome/views/table_view.h | 10 | ||||
| -rw-r--r-- | chrome/views/tree_node_model.h | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/chrome/views/table_view.h b/chrome/views/table_view.h index 88dada3..abe0f45 100644 --- a/chrome/views/table_view.h +++ b/chrome/views/table_view.h @@ -5,7 +5,11 @@ #ifndef CHROME_VIEWS_TABLE_VIEW_H_ #define CHROME_VIEWS_TABLE_VIEW_H_ +#include "build/build_config.h" + +#if defined(OS_WIN) #include <windows.h> +#endif // defined(OS_WIN) #include <map> #include <unicode/coll.h> @@ -14,7 +18,10 @@ #include "base/logging.h" #include "chrome/common/l10n_util.h" +#if defined(OS_WIN) +// TODO(port): remove the ifdef when native_control.h is ported. #include "chrome/views/native_control.h" +#endif // defined(OS_WIN) #include "SkColor.h" class SkBitmap; @@ -284,6 +291,8 @@ class TableViewObserver { virtual void OnTableViewDelete(TableView* table_view) {} }; +#if defined(OS_WIN) +// TODO(port): Port TableView. class TableView : public NativeControl, public TableModelObserver { public: @@ -661,6 +670,7 @@ class TableView : public NativeControl, DISALLOW_COPY_AND_ASSIGN(TableView); }; +#endif // defined(OS_WIN) } // namespace views diff --git a/chrome/views/tree_node_model.h b/chrome/views/tree_node_model.h index 695e4ab..18b93f9 100644 --- a/chrome/views/tree_node_model.h +++ b/chrome/views/tree_node_model.h @@ -189,8 +189,8 @@ class TreeNodeModel : public TreeModel { // Creates a TreeNodeModel with the specified root node. The root is owned // by the TreeNodeModel. explicit TreeNodeModel(NodeType* root) - : observer_(NULL), - root_(root) { + : root_(root), + observer_(NULL) { } virtual ~TreeNodeModel() {} |