diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 20:01:19 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-23 20:01:19 +0000 |
| commit | 30dce773eb5fcd940ade62bdb8da8bd86b539744 (patch) | |
| tree | 7a0474bfa7282c1c35a30ec57141a74b37a06dad /chrome/views | |
| parent | 65333c20ddb320cc0b5f5fd377d2a870f0e442fc (diff) | |
| download | chromium_src-30dce773eb5fcd940ade62bdb8da8bd86b539744.zip chromium_src-30dce773eb5fcd940ade62bdb8da8bd86b539744.tar.gz chromium_src-30dce773eb5fcd940ade62bdb8da8bd86b539744.tar.bz2 | |
Revert r8560 due to broken interactive_ui_tests
Review URL: http://codereview.chromium.org/18722
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8570 0039d316-1c4b-4281-b951-d872f2087c98
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, 2 insertions, 12 deletions
diff --git a/chrome/views/table_view.h b/chrome/views/table_view.h index abe0f45..88dada3 100644 --- a/chrome/views/table_view.h +++ b/chrome/views/table_view.h @@ -5,11 +5,7 @@ #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> @@ -18,10 +14,7 @@ #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; @@ -291,8 +284,6 @@ class TableViewObserver { virtual void OnTableViewDelete(TableView* table_view) {} }; -#if defined(OS_WIN) -// TODO(port): Port TableView. class TableView : public NativeControl, public TableModelObserver { public: @@ -670,7 +661,6 @@ 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 18b93f9..695e4ab 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) - : root_(root), - observer_(NULL) { + : observer_(NULL), + root_(root) { } virtual ~TreeNodeModel() {} |