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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 2024313002: Moves mash/wm/public -> ash/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 7 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 | « chrome/browser/chromeos/login/DEPS ('k') | mash/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index a247b2f913dd762fce1e99b559676540b4d992b3..39399d6971cad9ccf6d41a478110d64c69024ce6 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -105,8 +105,8 @@
#include "url/gurl.h"
#if defined(MOJO_SHELL_CLIENT)
+#include "ash/public/interfaces/container.mojom.h"
#include "components/mus/public/cpp/property_type_converters.h"
-#include "mash/wm/public/interfaces/container.mojom.h"
#endif
namespace {
@@ -1147,9 +1147,9 @@ void LoginDisplayHostImpl::InitLoginWindowAndView() {
ash::kShellWindowId_LockScreenContainer);
} else {
#if defined(MOJO_SHELL_CLIENT)
- params.mus_properties[mash::wm::mojom::kWindowContainer_Property] =
+ params.mus_properties[ash::mojom::kWindowContainer_Property] =
mojo::ConvertTo<std::vector<uint8_t>>(
- static_cast<int32_t>(mash::wm::mojom::Container::LOGIN_WINDOWS));
+ static_cast<int32_t>(ash::mojom::Container::LOGIN_WINDOWS));
#else
NOTREACHED();
#endif
« no previous file with comments | « chrome/browser/chromeos/login/DEPS ('k') | mash/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698