diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 01:35:51 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 01:35:51 +0000 |
| commit | b2968292db57db2a46c17b0b785f7224a0a63878 (patch) | |
| tree | f2a0b0c36e90393aaea82d567c3554606b354356 /ui | |
| parent | 6fdd4411046d735e9dba5a163d03262cc618a27f (diff) | |
| download | chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.zip chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.tar.gz chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.tar.bz2 | |
Fix a few warnings that -Wnull-conversion of a future clang will complain about.
BUG=none
TEST=none
TBR=OWNERS
NOTRY=true
Review URL: http://codereview.chromium.org/9845017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/compositor/layer_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/gfx/compositor/layer_unittest.cc index 9c360e9..571df13 100644 --- a/ui/gfx/compositor/layer_unittest.cc +++ b/ui/gfx/compositor/layer_unittest.cc @@ -365,7 +365,8 @@ class LayerWithDelegateTest : public testing::Test, public CompositorDelegate { // Overridden from testing::Test: virtual void SetUp() OVERRIDE { ui::SetupTestCompositor(); - compositor_.reset(new Compositor(this, NULL, gfx::Size(1000, 1000))); + compositor_.reset(new Compositor( + this, gfx::kNullAcceleratedWidget, gfx::Size(1000, 1000))); } virtual void TearDown() OVERRIDE { |