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 <memory> |
| 9 |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "build/build_config.h" | 11 #include "build/build_config.h" |
11 #include "ui/views/views_delegate.h" | 12 #include "ui/views/views_delegate.h" |
12 | 13 |
13 namespace wm { | 14 namespace wm { |
14 class WMState; | 15 class WMState; |
15 } | 16 } |
16 | 17 |
17 namespace views { | 18 namespace views { |
18 | 19 |
19 class TestViewsDelegate : public ViewsDelegate { | 20 class TestViewsDelegate : public ViewsDelegate { |
(...skipping 24 matching lines...) Expand all Loading... |
44 void OnBeforeWidgetInit(Widget::InitParams* params, | 45 void OnBeforeWidgetInit(Widget::InitParams* params, |
45 internal::NativeWidgetDelegate* delegate) override; | 46 internal::NativeWidgetDelegate* delegate) override; |
46 ui::ContextFactory* GetContextFactory() override; | 47 ui::ContextFactory* GetContextFactory() override; |
47 | 48 |
48 private: | 49 private: |
49 ui::ContextFactory* context_factory_; | 50 ui::ContextFactory* context_factory_; |
50 bool use_desktop_native_widgets_; | 51 bool use_desktop_native_widgets_; |
51 bool use_transparent_windows_; | 52 bool use_transparent_windows_; |
52 | 53 |
53 #if defined(USE_AURA) | 54 #if defined(USE_AURA) |
54 scoped_ptr<wm::WMState> wm_state_; | 55 std::unique_ptr<wm::WMState> wm_state_; |
55 #endif | 56 #endif |
56 | 57 |
57 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); | 58 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); |
58 }; | 59 }; |
59 | 60 |
60 } // namespace views | 61 } // namespace views |
61 | 62 |
62 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ | 63 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ |
OLD | NEW |