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

Unified Diff: chrome/test/base/view_event_test_base.cc

Issue 105813013: Adds views::corewm::WMState to install common state (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix viewseventtestbase Created 7 years 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 | « chrome/test/base/view_event_test_base.h ('k') | ui/aura/client/window_stacking_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/view_event_test_base.cc
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index e5af8a1dfc79938296c0cdc0faf66c403b24176a..be058ef2d994d09cdc6075bf3ae7ace7a88b5715 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -31,6 +31,7 @@
#include "ui/aura/env.h"
#include "ui/aura/root_window.h"
#include "ui/aura/test/aura_test_helper.h"
+#include "ui/views/corewm/wm_state.h"
#endif
#if defined(OS_CHROMEOS)
@@ -100,6 +101,10 @@ void ViewEventTestBase::Done() {
}
void ViewEventTestBase::SetUp() {
+#if defined(USE_AURA)
+ wm_state_.reset(new views::corewm::WMState);
+#endif
+
views::ViewsDelegate::views_delegate = &views_delegate_;
ui::InitializeInputMethodForTesting();
gfx::NativeView context = NULL;
@@ -174,6 +179,10 @@ void ViewEventTestBase::TearDown() {
ui::ShutdownInputMethodForTesting();
views::ViewsDelegate::views_delegate = NULL;
+
+#if defined(USE_AURA)
+ wm_state_.reset();
+#endif
}
bool ViewEventTestBase::CanResize() const {
« no previous file with comments | « chrome/test/base/view_event_test_base.h ('k') | ui/aura/client/window_stacking_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698