| 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 #ifndef UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ | 5 #ifndef UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ |
| 6 #define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ | 6 #define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "ui/views/views_delegate.h" | 9 #include "ui/views/views_delegate.h" |
| 10 | 10 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 Widget::InitParams* params, | 35 Widget::InitParams* params, |
| 36 internal::NativeWidgetDelegate* delegate) override; | 36 internal::NativeWidgetDelegate* delegate) override; |
| 37 | 37 |
| 38 private: | 38 private: |
| 39 bool use_desktop_native_widgets_; | 39 bool use_desktop_native_widgets_; |
| 40 | 40 |
| 41 bool use_transparent_windows_; | 41 bool use_transparent_windows_; |
| 42 | 42 |
| 43 #if defined(USE_AURA) | 43 #if defined(USE_AURA) |
| 44 scoped_ptr<wm::WMState> wm_state_; | 44 scoped_ptr<wm::WMState> wm_state_; |
| 45 | |
| 46 ui::ContextFactory* context_factory_; | |
| 47 #endif | 45 #endif |
| 48 | 46 |
| 49 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); | 47 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); |
| 50 }; | 48 }; |
| 51 | 49 |
| 52 } // namespace views | 50 } // namespace views |
| 53 | 51 |
| 54 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ | 52 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ |
| OLD | NEW |