Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1431)

Side by Side Diff: ui/views/test/test_views_delegate.cc

Issue 284233009: Adds ViewsDelegate::GetContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more spaces Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/test/test_views_delegate.h ('k') | ui/views/views_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/test_views_delegate.h" 5 #include "ui/views/test/test_views_delegate.h"
6 6
7 #include "ui/wm/core/wm_state.h" 7 #include "ui/wm/core/wm_state.h"
8 8
9 #if !defined(OS_CHROMEOS) 9 #if !defined(OS_CHROMEOS)
10 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 10 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
11 #endif // !defined(OS_CHROMEOS) 11 #endif // !defined(OS_CHROMEOS)
12 12
13 13
14 namespace views { 14 namespace views {
15 15
16 TestViewsDelegate::TestViewsDelegate() 16 TestViewsDelegate::TestViewsDelegate()
17 : use_desktop_native_widgets_(false), 17 : use_desktop_native_widgets_(false),
18 use_transparent_windows_(false) { 18 use_transparent_windows_(false)
19 #if defined(USE_AURA)
20 , context_factory_(NULL)
21 #endif
22 {
19 DCHECK(!ViewsDelegate::views_delegate); 23 DCHECK(!ViewsDelegate::views_delegate);
20 ViewsDelegate::views_delegate = this; 24 ViewsDelegate::views_delegate = this;
21 #if defined(USE_AURA) 25 #if defined(USE_AURA)
22 wm_state_.reset(new wm::WMState); 26 wm_state_.reset(new wm::WMState);
23 #endif 27 #endif
24 } 28 }
25 29
26 TestViewsDelegate::~TestViewsDelegate() { 30 TestViewsDelegate::~TestViewsDelegate() {
27 if (ViewsDelegate::views_delegate == this) 31 if (ViewsDelegate::views_delegate == this)
28 ViewsDelegate::views_delegate = NULL; 32 ViewsDelegate::views_delegate = NULL;
29 } 33 }
30 34
31 void TestViewsDelegate::OnBeforeWidgetInit( 35 void TestViewsDelegate::OnBeforeWidgetInit(
32 Widget::InitParams* params, 36 Widget::InitParams* params,
33 internal::NativeWidgetDelegate* delegate) { 37 internal::NativeWidgetDelegate* delegate) {
34 if (params->opacity == Widget::InitParams::INFER_OPACITY) { 38 if (params->opacity == Widget::InitParams::INFER_OPACITY) {
35 params->opacity = use_transparent_windows_ ? 39 params->opacity = use_transparent_windows_ ?
36 Widget::InitParams::TRANSLUCENT_WINDOW : 40 Widget::InitParams::TRANSLUCENT_WINDOW :
37 Widget::InitParams::OPAQUE_WINDOW; 41 Widget::InitParams::OPAQUE_WINDOW;
38 } 42 }
39 #if !defined(OS_CHROMEOS) 43 #if !defined(OS_CHROMEOS)
40 if (!params->native_widget && use_desktop_native_widgets_) 44 if (!params->native_widget && use_desktop_native_widgets_)
41 params->native_widget = new DesktopNativeWidgetAura(delegate); 45 params->native_widget = new DesktopNativeWidgetAura(delegate);
42 #endif // !defined(OS_CHROMEOS) 46 #endif // !defined(OS_CHROMEOS)
43 } 47 }
44 48
49 #if defined(USE_AURA)
50 ui::ContextFactory* TestViewsDelegate::GetContextFactory() {
51 return context_factory_;
52 }
53 #endif
54
45 } // namespace views 55 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/test/test_views_delegate.h ('k') | ui/views/views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698