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

Unified Diff: mash/wm/window_manager.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/wm/window_manager.h ('k') | mash/wm/window_manager_application.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager.cc
diff --git a/mash/wm/window_manager.cc b/mash/wm/window_manager.cc
index d6ff95fc539f8e77a221bd5f2b41faef6dbf4f71..5905469f76b869c80c77530be67e41bd82fcfef8 100644
--- a/mash/wm/window_manager.cc
+++ b/mash/wm/window_manager.cc
@@ -39,7 +39,7 @@ WindowManager::~WindowManager() {
}
void WindowManager::Initialize(RootWindowController* root_controller,
- mash::shell::mojom::Shell* shell) {
+ session::mojom::Session* session) {
DCHECK(root_controller);
DCHECK(!root_controller_);
root_controller_ = root_controller;
@@ -66,8 +66,8 @@ void WindowManager::Initialize(RootWindowController* root_controller,
window_manager_client_->SetFrameDecorationValues(
std::move(frame_decoration_values));
- if (shell)
- shell->AddScreenlockStateListener(binding_.CreateInterfacePtrAndBind());
+ if (session)
+ session->AddScreenlockStateListener(binding_.CreateInterfacePtrAndBind());
}
gfx::Rect WindowManager::CalculateDefaultBounds(mus::Window* window) const {
« no previous file with comments | « mash/wm/window_manager.h ('k') | mash/wm/window_manager_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698