Index: views/controls/table/table_view_unittest.cc |
=================================================================== |
--- views/controls/table/table_view_unittest.cc (revision 78148) |
+++ views/controls/table/table_view_unittest.cc (working copy) |
@@ -2,6 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#ifdef COMPILER_MSVCEXPRESS |
+#include <atlbase.h> |
+#include <atlwin.h> // Avoid WinDDK intsafe.h/XINTXX_MIN/MAX conflicts |
+#endif |
#include <vector> |
#include "base/compiler_specific.h" |
@@ -21,7 +25,7 @@ |
#endif |
using ui::TableModel; |
-using ui::TableModelObserver; // TODO(beng): remove these |
+using ui::TableModelObserver; // TODO(beng): remove these |
// Put the tests in the views namespace to make it easier to declare them as |
// friend classes. |