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

Unified Diff: ash/touch_hud/mus/touch_hud_application.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: rebase 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/touch_hud/mus/BUILD.gn ('k') | ash/utility/screenshot_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch_hud/mus/touch_hud_application.cc
diff --git a/ash/touch_hud/mus/touch_hud_application.cc b/ash/touch_hud/mus/touch_hud_application.cc
index de4f6dba70e3ae8e830628ae719bece4d4df3e0d..2889b4263bfebcb29f5265bb4a806ea8766c2d2d 100644
--- a/ash/touch_hud/mus/touch_hud_application.cc
+++ b/ash/touch_hud/mus/touch_hud_application.cc
@@ -4,7 +4,7 @@
#include "ash/touch_hud/mus/touch_hud_application.h"
-#include "ash/public/interfaces/container.mojom.h"
+#include "ash/public/cpp/shell_window_ids.h"
#include "ash/touch_hud/touch_hud_renderer.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
@@ -88,9 +88,9 @@ void TouchHudApplication::Launch(uint32_t what, mash::mojom::LaunchMode how) {
params.delegate = new TouchHudUI(window_manager_connection_.get(), widget_);
std::map<std::string, std::vector<uint8_t>> properties;
- properties[ash::mojom::kWindowContainer_Property] =
+ properties[ui::mojom::WindowManager::kInitialContainerId_Property] =
mojo::ConvertTo<std::vector<uint8_t>>(
- static_cast<int32_t>(ash::mojom::Container::OVERLAY));
+ ash::kShellWindowId_OverlayContainer);
properties[ui::mojom::WindowManager::kShowState_Property] =
mojo::ConvertTo<std::vector<uint8_t>>(
static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN));
« no previous file with comments | « ash/touch_hud/mus/BUILD.gn ('k') | ash/utility/screenshot_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698