diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 23:01:26 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 23:01:26 +0000 |
| commit | 0a7347ffaf22c5edadac59c694305328847526e3 (patch) | |
| tree | 7f657c4d851a80bdd0cf45bea2eecfe427739ca0 /ui/aura/window_unittest.cc | |
| parent | 976219a862c6764638a793a22f7ffd6da95cc987 (diff) | |
| download | chromium_src-0a7347ffaf22c5edadac59c694305328847526e3.zip chromium_src-0a7347ffaf22c5edadac59c694305328847526e3.tar.gz chromium_src-0a7347ffaf22c5edadac59c694305328847526e3.tar.bz2 | |
Fix aura build on MSVS 2010.
BUG=129223
Review URL: https://chromiumcodereview.appspot.com/10411097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window_unittest.cc')
| -rw-r--r-- | ui/aura/window_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index 1cfac96..504dc72 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -1354,7 +1354,8 @@ TEST_F(WindowObserverTest, PropertyChanged) { PropertyChangeInfoAndClear()); // Sanity check to see if |PropertyChangeInfoAndClear| really clears. - EXPECT_EQ(PropertyChangeInfo(NULL, -3), PropertyChangeInfoAndClear()); + EXPECT_EQ(PropertyChangeInfo( + reinterpret_cast<const void*>(NULL), -3), PropertyChangeInfoAndClear()); } TEST_F(WindowTest, AcquireLayer) { |