| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/test/views_test_helper.h" | 5 #include "ui/views/test/views_test_helper.h" |
| 6 | 6 |
| 7 namespace views { | 7 namespace views { |
| 8 | 8 |
| 9 #if !defined(USE_AURA) | 9 #if !defined(USE_AURA) |
| 10 // static | 10 // static |
| 11 ViewsTestHelper* ViewsTestHelper::Create(base::MessageLoopForUI* message_loop) { | 11 ViewsTestHelper* ViewsTestHelper::Create(base::MessageLoopForUI* message_loop, |
| 12 ui::ContextFactory* context_factory) { |
| 12 return new ViewsTestHelper; | 13 return new ViewsTestHelper; |
| 13 } | 14 } |
| 14 #endif | 15 #endif |
| 15 | 16 |
| 16 ViewsTestHelper::ViewsTestHelper() { | 17 ViewsTestHelper::ViewsTestHelper() { |
| 17 } | 18 } |
| 18 | 19 |
| 19 ViewsTestHelper::~ViewsTestHelper() { | 20 ViewsTestHelper::~ViewsTestHelper() { |
| 20 } | 21 } |
| 21 | 22 |
| 22 void ViewsTestHelper::SetUp() { | 23 void ViewsTestHelper::SetUp() { |
| 23 } | 24 } |
| 24 | 25 |
| 25 void ViewsTestHelper::TearDown() { | 26 void ViewsTestHelper::TearDown() { |
| 26 } | 27 } |
| 27 | 28 |
| 28 gfx::NativeView ViewsTestHelper::GetContext() { | 29 gfx::NativeView ViewsTestHelper::GetContext() { |
| 29 return NULL; | 30 return NULL; |
| 30 } | 31 } |
| 31 | 32 |
| 32 } // namespace views | 33 } // namespace views |
| OLD | NEW |