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

Unified Diff: ash/test/ash_test_helper.cc

Issue 2434463004: mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient. (Closed)
Patch Set: Rebase to ToT 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/shell/shell_delegate_impl.cc ('k') | ash/test/test_shell_delegate.h » ('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 2c64b655a2a9f86c321a015bcf5520436f29a6d8..d3377a6d0e0c7dc0fdca634d6eaa679082acecc4 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -7,8 +7,10 @@
#include "ash/accelerators/accelerator_controller_delegate_aura.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/test/material_design_controller_test_api.h"
+#include "ash/common/test/test_new_window_client.h"
#include "ash/common/test/test_session_state_delegate.h"
#include "ash/common/test/test_system_tray_delegate.h"
+#include "ash/common/test/wm_shell_test_api.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/shell_init_params.h"
@@ -151,6 +153,8 @@ void AshTestHelper::SetUp(bool start_session,
test_screenshot_delegate_ = new TestScreenshotDelegate();
shell->accelerator_controller_delegate()->SetScreenshotDelegate(
std::unique_ptr<ScreenshotDelegate>(test_screenshot_delegate_));
+
+ WmShellTestApi().SetNewWindowClient(base::MakeUnique<TestNewWindowClient>());
}
void AshTestHelper::TearDown() {
« no previous file with comments | « ash/shell/shell_delegate_impl.cc ('k') | ash/test/test_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698