| Index: ui/views/test/test_views_delegate.h
|
| diff --git a/ui/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h
|
| index 5d80e085e96de6a7e6773c3fbbcc553c88cf1bac..384d7ac5e11eb740329343200a0b2cb83df83ba7 100644
|
| --- a/ui/views/test/test_views_delegate.h
|
| +++ b/ui/views/test/test_views_delegate.h
|
| @@ -30,16 +30,29 @@ class TestViewsDelegate : public ViewsDelegate {
|
| use_transparent_windows_ = transparent;
|
| }
|
|
|
| +#if defined(USE_AURA)
|
| + void set_context_factory(ui::ContextFactory* context_factory) {
|
| + context_factory_ = context_factory;
|
| + }
|
| +#endif
|
| +
|
| // ViewsDelegate:
|
| virtual void OnBeforeWidgetInit(
|
| Widget::InitParams* params,
|
| internal::NativeWidgetDelegate* delegate) OVERRIDE;
|
| +#if defined(USE_AURA)
|
| + virtual ui::ContextFactory* GetContextFactory() OVERRIDE;
|
| +#endif
|
|
|
| private:
|
| bool use_desktop_native_widgets_;
|
| +
|
| bool use_transparent_windows_;
|
| +
|
| #if defined(USE_AURA)
|
| scoped_ptr<wm::WMState> wm_state_;
|
| +
|
| + ui::ContextFactory* context_factory_;
|
| #endif
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
|
|
|