diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 00:42:06 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 00:42:06 +0000 |
| commit | e3c3eae6043ae1c69b9a21c9584abcf467604aa1 (patch) | |
| tree | fb061f48e0fb4200d0a9cfd8ceeb47e24d3db884 /views/view_unittest.cc | |
| parent | eaf6dd563c1057e8adb4ec20d0d85e2c07cb5f13 (diff) | |
| download | chromium_src-e3c3eae6043ae1c69b9a21c9584abcf467604aa1.zip chromium_src-e3c3eae6043ae1c69b9a21c9584abcf467604aa1.tar.gz chromium_src-e3c3eae6043ae1c69b9a21c9584abcf467604aa1.tar.bz2 | |
Get views_unittests to compile (but not run).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7824021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view_unittest.cc')
| -rw-r--r-- | views/view_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 94d6d4d..213b28c 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -699,7 +699,7 @@ TEST_F(ViewTest, Textfield) { widget->CloseNow(); } -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) // Tests that the Textfield view respond appropiately to cut/copy/paste. TEST_F(ViewTest, TextfieldCutCopyPaste) { @@ -821,7 +821,7 @@ bool TestView::AcceleratorPressed(const Accelerator& accelerator) { return true; } -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) TEST_F(ViewTest, ActivateAccelerator) { // Register a keyboard accelerator before the view is added to a window. Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); @@ -887,7 +887,7 @@ TEST_F(ViewTest, ActivateAccelerator) { } #endif -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) TEST_F(ViewTest, HiddenViewWithAccelerator) { Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); TestView* view = new TestView(); @@ -918,7 +918,7 @@ TEST_F(ViewTest, HiddenViewWithAccelerator) { } #endif -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) //////////////////////////////////////////////////////////////////////////////// // Mouse-wheel message rerouting //////////////////////////////////////////////////////////////////////////////// @@ -2348,7 +2348,7 @@ void TestTexture::SetCanvas(const SkCanvas& canvas, class TestCompositor : public ui::Compositor { public: - TestCompositor() {} + TestCompositor() : Compositor(gfx::Size(100, 100)) {} // ui::Compositor: virtual ui::Texture* CreateTexture() OVERRIDE { |