| 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 #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_H_ | 5 #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_H_ |
| 6 #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_H_ | 6 #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_H_ |
| 7 | 7 |
| 8 #include "ui/gfx/native_widget_types.h" | 8 #include "ui/gfx/native_widget_types.h" |
| 9 | 9 |
| 10 namespace base { | 10 namespace base { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 ui::ContextFactory* context_factory); | 29 ui::ContextFactory* context_factory); |
| 30 | 30 |
| 31 // Creates objects that are needed for tests. | 31 // Creates objects that are needed for tests. |
| 32 virtual void SetUp(); | 32 virtual void SetUp(); |
| 33 | 33 |
| 34 // Clean up objects that were created for tests. | 34 // Clean up objects that were created for tests. |
| 35 virtual void TearDown(); | 35 virtual void TearDown(); |
| 36 | 36 |
| 37 // Returns a context view. In aura builds, this will be the | 37 // Returns a context view. In aura builds, this will be the |
| 38 // RootWindow. Everywhere else, NULL. | 38 // RootWindow. Everywhere else, NULL. |
| 39 virtual gfx::NativeView GetContext(); | 39 virtual gfx::NativeWindow GetContext(); |
| 40 | 40 |
| 41 private: | 41 private: |
| 42 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelper); | 42 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelper); |
| 43 }; | 43 }; |
| 44 | 44 |
| 45 } // namespace views | 45 } // namespace views |
| 46 | 46 |
| 47 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_H_ | 47 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_H_ |
| OLD | NEW |