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

Unified 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: incorporate feedback 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/test/test_views_delegate.h ('k') | ui/views/test/widget_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/test_views_delegate.cc
diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc
index dc564734abdb3b137b4bbf66df6dd2cc9a4686be..b299ceb912330a7af2c5112a2a2b1fffb66b1e9a 100644
--- a/ui/views/test/test_views_delegate.cc
+++ b/ui/views/test/test_views_delegate.cc
@@ -7,25 +7,20 @@
#include "base/command_line.h"
#include "base/logging.h"
#include "content/public/test/web_contents_tester.h"
+#include "ui/views/corewm/wm_state.h"
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
#include "ui/views/widget/native_widget_aura.h"
#endif
-#if defined(USE_AURA)
-#include "ui/views/corewm/wm_state.h"
-#endif
-
namespace views {
TestViewsDelegate::TestViewsDelegate()
: use_transparent_windows_(false) {
DCHECK(!ViewsDelegate::views_delegate);
ViewsDelegate::views_delegate = this;
-#if defined(USE_AURA)
wm_state_.reset(new views::corewm::WMState);
-#endif
}
TestViewsDelegate::~TestViewsDelegate() {
« no previous file with comments | « ui/views/test/test_views_delegate.h ('k') | ui/views/test/widget_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698