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

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

Issue 2503623002: Support creation of toplevel mus::Windows on separate displays (Closed)
Patch Set: Edit comments/names. 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
« no previous file with comments | « ash/mus/test/wm_test_base.h ('k') | ash/mus/window_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..c480927f3b3340e79d4a624b6360dacabfab59ab 100644
--- a/ash/mus/test/wm_test_base.cc
+++ b/ash/mus/test/wm_test_base.cc
@@ -14,7 +14,6 @@
#include "ash/mus/window_manager_application.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/cpp/window_tree_client.h"
-#include "ui/display/display.h"
namespace ash {
namespace mus {
@@ -123,11 +122,15 @@ ui::Window* WmTestBase::CreateTestWindow(const gfx::Rect& bounds,
return window;
}
-ui::Window* WmTestBase::CreateFullscreenTestWindow() {
+ui::Window* WmTestBase::CreateFullscreenTestWindow(int64_t display_id) {
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));
+
+ properties[ui::mojom::WindowManager::kInitialDisplayId_Property] =
+ mojo::ConvertTo<std::vector<uint8_t>>(display_id);
kylechar 2016/11/23 00:28:00 For the default value kInvalidDisplayId, do you re
thanhph 2016/11/23 01:05:02 Good question. I found a use case of kInvalidDispl
kylechar 2016/11/23 14:14:20 So the value kInvalidDisplayId is appropriate to u
+
ui::Window* window = test_helper_->GetRootsOrderedByDisplayId()[0]
->window_manager()
->NewTopLevelWindow(&properties);
« no previous file with comments | « ash/mus/test/wm_test_base.h ('k') | ash/mus/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698