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

Unified Diff: ui/aura/test/aura_test_helper.cc

Issue 2453953003: Moves TransientWindowClient to ui/aura/client and adds observer (Closed)
Patch Set: merge Created 4 years, 2 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/aura/test/aura_test_helper.h ('k') | ui/views/corewm/tooltip_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_helper.cc
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
index d3e39e3f19f9ef968e41d2438fee98d515fec7d4..4142a11d5091e4d893a425e79b667b2d7312ed92 100644
--- a/ui/aura/test/aura_test_helper.cc
+++ b/ui/aura/test/aura_test_helper.cc
@@ -4,7 +4,6 @@
#include "ui/aura/test/aura_test_helper.h"
-#include "base/bind.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
@@ -29,6 +28,7 @@
#include "ui/compositor/layer_animator.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/display/screen.h"
+#include "ui/wm/core/wm_state.h"
#if defined(USE_X11)
#include "ui/aura/window_tree_host_x11.h"
@@ -70,6 +70,7 @@ void AuraTestHelper::EnableMus(WindowTreeClientDelegate* window_tree_delegate,
void AuraTestHelper::SetUp(ui::ContextFactory* context_factory) {
setup_called_ = true;
+ wm_state_ = base::MakeUnique<wm::WMState>();
// Needs to be before creating WindowTreeClient.
focus_client_ = base::MakeUnique<TestFocusClient>();
capture_client_ = base::MakeUnique<client::DefaultCaptureClient>();
@@ -137,6 +138,7 @@ void AuraTestHelper::TearDown() {
EnvTestHelper(Env::GetInstance())
.SetWindowPortFactory(Env::WindowPortFactory());
}
+ wm_state_.reset();
}
void AuraTestHelper::RunAllPendingInMessageLoop() {
« no previous file with comments | « ui/aura/test/aura_test_helper.h ('k') | ui/views/corewm/tooltip_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698