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 18 matching lines...) Expand all Loading... |
29 void set_use_transparent_windows(bool transparent) { | 29 void set_use_transparent_windows(bool transparent) { |
30 use_transparent_windows_ = transparent; | 30 use_transparent_windows_ = transparent; |
31 } | 31 } |
32 | 32 |
33 // Allows tests to provide a ContextFactory via the ViewsDelegate interface. | 33 // Allows tests to provide a ContextFactory via the ViewsDelegate interface. |
34 void set_context_factory(ui::ContextFactory* context_factory) { | 34 void set_context_factory(ui::ContextFactory* context_factory) { |
35 context_factory_ = context_factory; | 35 context_factory_ = context_factory; |
36 } | 36 } |
37 | 37 |
38 // ViewsDelegate: | 38 // ViewsDelegate: |
| 39 #if defined(OS_WIN) |
| 40 HICON GetSmallWindowIcon() const override { return nullptr; } |
| 41 #endif |
39 void OnBeforeWidgetInit(Widget::InitParams* params, | 42 void OnBeforeWidgetInit(Widget::InitParams* params, |
40 internal::NativeWidgetDelegate* delegate) override; | 43 internal::NativeWidgetDelegate* delegate) override; |
41 ui::ContextFactory* GetContextFactory() override; | 44 ui::ContextFactory* GetContextFactory() override; |
42 | 45 |
43 private: | 46 private: |
44 ui::ContextFactory* context_factory_; | 47 ui::ContextFactory* context_factory_; |
45 bool use_desktop_native_widgets_; | 48 bool use_desktop_native_widgets_; |
46 bool use_transparent_windows_; | 49 bool use_transparent_windows_; |
47 | 50 |
48 #if defined(USE_AURA) | 51 #if defined(USE_AURA) |
49 scoped_ptr<wm::WMState> wm_state_; | 52 scoped_ptr<wm::WMState> wm_state_; |
50 #endif | 53 #endif |
51 | 54 |
52 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); | 55 DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate); |
53 }; | 56 }; |
54 | 57 |
55 } // namespace views | 58 } // namespace views |
56 | 59 |
57 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ | 60 #endif // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_ |
OLD | NEW |