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 #include "ui/views/test/test_views_delegate.h" | 5 #include "ui/views/test/test_views_delegate.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "content/public/test/web_contents_tester.h" | 9 #include "content/public/test/web_contents_tester.h" |
10 | 10 |
11 #if defined(USE_AURA) && !defined(OS_CHROMEOS) | 11 #if defined(USE_AURA) && !defined(OS_CHROMEOS) |
12 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 12 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
13 #include "ui/views/widget/native_widget_aura.h" | 13 #include "ui/views/widget/native_widget_aura.h" |
14 #endif | 14 #endif |
15 | 15 |
| 16 #if defined(USE_AURA) |
| 17 #include "ui/views/corewm/wm_state.h" |
| 18 #endif |
| 19 |
16 namespace views { | 20 namespace views { |
17 | 21 |
18 TestViewsDelegate::TestViewsDelegate() | 22 TestViewsDelegate::TestViewsDelegate() |
19 : use_transparent_windows_(false) { | 23 : use_transparent_windows_(false) { |
20 DCHECK(!ViewsDelegate::views_delegate); | 24 DCHECK(!ViewsDelegate::views_delegate); |
21 ViewsDelegate::views_delegate = this; | 25 ViewsDelegate::views_delegate = this; |
| 26 #if defined(USE_AURA) |
| 27 wm_state_.reset(new views::corewm::WMState); |
| 28 #endif |
22 } | 29 } |
23 | 30 |
24 TestViewsDelegate::~TestViewsDelegate() { | 31 TestViewsDelegate::~TestViewsDelegate() { |
25 ViewsDelegate::views_delegate = NULL; | 32 ViewsDelegate::views_delegate = NULL; |
26 } | 33 } |
27 | 34 |
28 void TestViewsDelegate::SetUseTransparentWindows(bool transparent) { | 35 void TestViewsDelegate::SetUseTransparentWindows(bool transparent) { |
29 use_transparent_windows_ = transparent; | 36 use_transparent_windows_ = transparent; |
30 } | 37 } |
31 | 38 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 else | 76 else |
70 params->opacity = Widget::InitParams::OPAQUE_WINDOW; | 77 params->opacity = Widget::InitParams::OPAQUE_WINDOW; |
71 } | 78 } |
72 } | 79 } |
73 | 80 |
74 base::TimeDelta TestViewsDelegate::GetDefaultTextfieldObscuredRevealDuration() { | 81 base::TimeDelta TestViewsDelegate::GetDefaultTextfieldObscuredRevealDuration() { |
75 return base::TimeDelta(); | 82 return base::TimeDelta(); |
76 } | 83 } |
77 | 84 |
78 } // namespace views | 85 } // namespace views |
OLD | NEW |