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

Unified Diff: mash/wm/window_manager.h

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/wm/root_window_controller.cc ('k') | mash/wm/window_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager.h
diff --git a/mash/wm/window_manager.h b/mash/wm/window_manager.h
index 7542d1b4ac806a699cecf46e62b45c829cda7cd1..96c0b8a83d7f5cbacecad1b858b9a6e5168f4be9 100644
--- a/mash/wm/window_manager.h
+++ b/mash/wm/window_manager.h
@@ -12,7 +12,7 @@
#include "components/mus/public/cpp/window_manager_delegate.h"
#include "components/mus/public/cpp/window_observer.h"
#include "components/mus/public/interfaces/window_manager.mojom.h"
-#include "mash/shell/public/interfaces/shell.mojom.h"
+#include "mash/session/public/interfaces/session.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
namespace mash {
@@ -22,13 +22,13 @@ class RootWindowController;
class WindowManager : public mus::WindowObserver,
public mus::WindowManagerDelegate,
- public mash::shell::mojom::ScreenlockStateListener {
+ public session::mojom::ScreenlockStateListener {
public:
WindowManager();
~WindowManager() override;
void Initialize(RootWindowController* root_controller,
- mash::shell::mojom::Shell* shell);
+ session::mojom::Session* session);
mus::WindowManagerClient* window_manager_client() {
return window_manager_client_;
@@ -61,7 +61,7 @@ class WindowManager : public mus::WindowObserver,
RootWindowController* root_controller_;
mus::WindowManagerClient* window_manager_client_;
- mojo::Binding<mash::shell::mojom::ScreenlockStateListener> binding_;
+ mojo::Binding<session::mojom::ScreenlockStateListener> binding_;
DISALLOW_COPY_AND_ASSIGN(WindowManager);
};
« no previous file with comments | « mash/wm/root_window_controller.cc ('k') | mash/wm/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698