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

Unified Diff: mash/screenlock/screenlock.cc

Issue 1817443002: Rename mash_shell to mash_session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/screenlock.h ('k') | mash/session/BUILD.gn » ('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 60f6f1ea3d6fc4b6e18d2afc91889ff2f08834a9..310164d763540786f8e23ed9797e36b941cfb23f 100644
--- a/mash/screenlock/screenlock.cc
+++ b/mash/screenlock/screenlock.cc
@@ -7,7 +7,7 @@
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
#include "components/mus/public/cpp/property_type_converters.h"
-#include "mash/shell/public/interfaces/shell.mojom.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 "mojo/shell/public/cpp/connector.h"
@@ -59,9 +59,9 @@ class ScreenlockView : public views::WidgetDelegateView,
// Overridden from views::ButtonListener:
void ButtonPressed(views::Button* sender, const ui::Event& event) override {
DCHECK_EQ(sender, unlock_button_);
- mash::shell::mojom::ShellPtr shell;
- connector_->ConnectToInterface("mojo:mash_shell", &shell);
- shell->UnlockScreen();
+ mash::session::mojom::SessionPtr session;
+ connector_->ConnectToInterface("mojo:mash_session", &session);
+ session->UnlockScreen();
}
mojo::Connector* connector_;
@@ -80,9 +80,9 @@ void Screenlock::Initialize(mojo::Connector* connector,
uint32_t id) {
tracing_.Initialize(connector, identity.name());
- mash::shell::mojom::ShellPtr mash_shell;
- connector->ConnectToInterface("mojo:mash_shell", &mash_shell);
- mash_shell->AddScreenlockStateListener(
+ mash::session::mojom::SessionPtr session;
+ connector->ConnectToInterface("mojo:mash_session", &session);
+ session->AddScreenlockStateListener(
bindings_.CreateInterfacePtrAndBind(this));
aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
« no previous file with comments | « mash/screenlock/screenlock.h ('k') | mash/session/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698