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

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

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 6 years, 9 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
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 "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 #include "ui/views/corewm/wm_state.h"
10 11
11 #if defined(USE_AURA) && !defined(OS_CHROMEOS) 12 #if !defined(OS_CHROMEOS)
12 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 13 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
13 #include "ui/views/widget/native_widget_aura.h" 14 #include "ui/views/widget/native_widget_aura.h"
14 #endif 15 #endif
15 16
16 #if defined(USE_AURA)
17 #include "ui/views/corewm/wm_state.h"
18 #endif
19
20 namespace views { 17 namespace views {
21 18
22 TestViewsDelegate::TestViewsDelegate() 19 TestViewsDelegate::TestViewsDelegate()
23 : use_transparent_windows_(false) { 20 : use_transparent_windows_(false) {
24 DCHECK(!ViewsDelegate::views_delegate); 21 DCHECK(!ViewsDelegate::views_delegate);
25 ViewsDelegate::views_delegate = this; 22 ViewsDelegate::views_delegate = this;
26 #if defined(USE_AURA)
27 wm_state_.reset(new views::corewm::WMState); 23 wm_state_.reset(new views::corewm::WMState);
28 #endif
29 } 24 }
30 25
31 TestViewsDelegate::~TestViewsDelegate() { 26 TestViewsDelegate::~TestViewsDelegate() {
32 ViewsDelegate::views_delegate = NULL; 27 ViewsDelegate::views_delegate = NULL;
33 } 28 }
34 29
35 void TestViewsDelegate::SetUseTransparentWindows(bool transparent) { 30 void TestViewsDelegate::SetUseTransparentWindows(bool transparent) {
36 use_transparent_windows_ = transparent; 31 use_transparent_windows_ = transparent;
37 } 32 }
38 33
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 else 71 else
77 params->opacity = Widget::InitParams::OPAQUE_WINDOW; 72 params->opacity = Widget::InitParams::OPAQUE_WINDOW;
78 } 73 }
79 } 74 }
80 75
81 base::TimeDelta TestViewsDelegate::GetDefaultTextfieldObscuredRevealDuration() { 76 base::TimeDelta TestViewsDelegate::GetDefaultTextfieldObscuredRevealDuration() {
82 return base::TimeDelta(); 77 return base::TimeDelta();
83 } 78 }
84 79
85 } // namespace views 80 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698