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

Unified Diff: mash/screenlock/screenlock.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 | « mash/screenlock/BUILD.gn ('k') | mash/unittests_manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/screenlock/screenlock.cc
diff --git a/mash/screenlock/screenlock.cc b/mash/screenlock/screenlock.cc
index 1731f853b39182dfa81b195d7c83e2e6fcc376a4..79d21c4d423d20c59c63142028573415204b0958 100644
--- a/mash/screenlock/screenlock.cc
+++ b/mash/screenlock/screenlock.cc
@@ -4,11 +4,11 @@
#include "mash/screenlock/screenlock.h"
+#include "ash/public/interfaces/container.mojom.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "components/mus/public/cpp/property_type_converters.h"
#include "mash/session/public/interfaces/session.mojom.h"
-#include "mash/wm/public/interfaces/container.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/shell/public/cpp/connector.h"
#include "ui/views/background.h"
@@ -94,9 +94,9 @@ void Screenlock::Initialize(shell::Connector* connector,
params.delegate = new ScreenlockView(connector);
std::map<std::string, std::vector<uint8_t>> properties;
- properties[mash::wm::mojom::kWindowContainer_Property] =
+ 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));
mus::Window* window =
views::WindowManagerConnection::Get()->NewWindow(properties);
params.native_widget = new views::NativeWidgetMus(
@@ -111,4 +111,4 @@ void Screenlock::ScreenlockStateChanged(bool screen_locked) {
}
} // namespace screenlock
-} // namespace main
+} // namespace mash
« no previous file with comments | « mash/screenlock/BUILD.gn ('k') | mash/unittests_manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698