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

Unified Diff: components/exo/wayland/server.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 | « components/exo/wayland/BUILD.gn ('k') | mash/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/wayland/server.cc
diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index 53b20f9432e12933ea581195d6beb1b66a0a4470..7b3d47ed80040647c1ddc52cbfadf1d94d6f513a 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc
@@ -18,8 +18,8 @@
#include <remote-shell-unstable-v1-server-protocol.h> // NOLINT
#include <secure-output-unstable-v1-server-protocol.h> // NOLINT
#include <stylus-unstable-v1-server-protocol.h> // NOLINT
-#include <xdg-shell-unstable-v5-server-protocol.h> // NOLINT
#include <vsync-feedback-unstable-v1-server-protocol.h> // NOLINT
+#include <xdg-shell-unstable-v5-server-protocol.h> // NOLINT
#include <algorithm>
#include <cstdlib>
@@ -28,7 +28,7 @@
#include <utility>
#include "ash/common/shell_observer.h"
-#include "ash/common/shell_window_ids.h"
+#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
#include "base/bind.h"
#include "base/cancelable_callback.h"
« no previous file with comments | « components/exo/wayland/BUILD.gn ('k') | mash/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698