mash/wm/root_window_controller.cc - Issue 1817443002: Rename mash_shell to mash_session.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mash/wm/root_window_controller.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:

Index: mash/wm/root_window_controller.cc

diff --git a/mash/wm/root_window_controller.cc b/mash/wm/root_window_controller.cc

index ca74674d48c46684746311f0d51673472cbf9d07..934f3641ff5c5b39aad688c1aa6b8e53c26ff03c 100644

--- a/mash/wm/root_window_controller.cc

+++ b/mash/wm/root_window_controller.cc

@@ -12,7 +12,7 @@

#include "components/mus/public/cpp/window.h"

#include "components/mus/public/cpp/window_tree_connection.h"

#include "components/mus/public/cpp/window_tree_host_factory.h"

-#include "mash/shell/public/interfaces/shell.mojom.h"

+#include "mash/session/public/interfaces/session.mojom.h"

#include "mash/wm/background_layout.h"

#include "mash/wm/fill_layout.h"

#include "mash/wm/screenlock_layout.h"

@@ -132,7 +132,7 @@ void RootWindowController::OnEmbed(mus::Window* root) {

AddAccelerators();

- window_manager_->Initialize(this, app_->mash_shell());

+ window_manager_->Initialize(this, app_->session());

shadow_controller_.reset(new ShadowController(root->connection()));

« no previous file with comments | « mash/wm/BUILD.gn ('k') | mash/wm/window_manager.h » ('j') | no next file with comments »