| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_base.h" | 5 #include "ui/views/test/views_test_base.h" |
| 6 | 6 |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "ui/base/clipboard/clipboard.h" | 8 #include "ui/base/clipboard/clipboard.h" |
| 9 | 9 |
| 10 #if defined(USE_AURA) | 10 #if defined(USE_AURA) |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 | 62 |
| 63 Widget::InitParams ViewsTestBase::CreateParams( | 63 Widget::InitParams ViewsTestBase::CreateParams( |
| 64 Widget::InitParams::Type type) { | 64 Widget::InitParams::Type type) { |
| 65 Widget::InitParams params(type); | 65 Widget::InitParams params(type); |
| 66 #if defined(USE_AURA) | 66 #if defined(USE_AURA) |
| 67 params.context = aura_test_helper_->root_window(); | 67 params.context = aura_test_helper_->root_window(); |
| 68 #endif | 68 #endif |
| 69 return params; | 69 return params; |
| 70 } | 70 } |
| 71 | 71 |
| 72 gfx::NativeView ViewsTestBase::GetContext() { |
| 73 #if defined(USE_AURA) |
| 74 return aura_test_helper_->root_window(); |
| 75 #else |
| 76 return NULL; |
| 77 #endif |
| 78 } |
| 79 |
| 72 } // namespace views | 80 } // namespace views |
| OLD | NEW |