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

Unified Diff: ash/test/ash_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 | « ash/test/ash_test_helper.h ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index d3377a6d0e0c7dc0fdca634d6eaa679082acecc4..f882d7c29da5a12c5005da0f521509e7d9bad362 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -20,6 +20,7 @@
#include "ash/test/shell_test_api.h"
#include "ash/test/test_screenshot_delegate.h"
#include "ash/test/test_shell_delegate.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "ui/aura/env.h"
#include "ui/aura/input_state_lookup.h"
@@ -34,6 +35,7 @@
#include "ui/message_center/message_center.h"
#include "ui/wm/core/capture_controller.h"
#include "ui/wm/core/cursor_manager.h"
+#include "ui/wm/core/wm_state.h"
#if defined(OS_CHROMEOS)
#include "ash/system/chromeos/screen_layout_observer.h"
@@ -73,6 +75,7 @@ AshTestHelper::~AshTestHelper() {}
void AshTestHelper::SetUp(bool start_session,
MaterialDesignController::Mode material_mode) {
display::ResetDisplayIdForTest();
+ wm_state_ = base::MakeUnique<::wm::WMState>();
views_delegate_ = ash_test_environment_->CreateViewsDelegate();
// Disable animations during tests.
« no previous file with comments | « ash/test/ash_test_helper.h ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698