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

Unified Diff: ash/mus/test/wm_test_base.cc

Issue 2503623002: Support creation of toplevel mus::Windows on separate displays (Closed)
Patch Set: Remove GetPrimary/SecondaryRootWindowController methods. Created 4 years, 1 month 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
Index: ash/mus/test/wm_test_base.cc
diff --git a/ash/mus/test/wm_test_base.cc b/ash/mus/test/wm_test_base.cc
index c45eb6e73457fd27f8e573754940c7f90f90f533..71192e1ad21e206aaf9556cef68222bdef29d096 100644
--- a/ash/mus/test/wm_test_base.cc
+++ b/ash/mus/test/wm_test_base.cc
@@ -123,11 +123,16 @@ ui::Window* WmTestBase::CreateTestWindow(const gfx::Rect& bounds,
return window;
}
-ui::Window* WmTestBase::CreateFullscreenTestWindow() {
+ui::Window* WmTestBase::CreateFullscreenTestWindow(int64_t display_id = 0) {
std::map<std::string, std::vector<uint8_t>> properties;
properties[ui::mojom::WindowManager::kShowState_Property] =
mojo::ConvertTo<std::vector<uint8_t>>(
static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN));
+
+ if (display_id)
mfomitchev 2016/11/18 21:23:40 Need braces around multiline statement.
thanhph 2016/11/21 14:37:53 Done.
+ properties[ui::mojom::WindowManager::kInitialDisplayId_Property] =
+ mojo::ConvertTo<std::vector<uint8_t>>(display_id);
mfomitchev 2016/11/18 21:23:40 Is 0 display id guaranteed to be the same as havin
thanhph 2016/11/21 14:37:53 Done. I change from 0 to display::Display::kInvali
mfomitchev 2016/11/22 22:53:16 Wait, this is different. Now we can't call this me
+
ui::Window* window = test_helper_->GetRootsOrderedByDisplayId()[0]
->window_manager()
->NewTopLevelWindow(&properties);

Powered by Google App Engine
This is Rietveld 408576698