ash/common/mojo_interface_factory.cc - Issue 2738133003: Promotes a handful of members from WmShell to Shell

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: ash/common/mojo_interface_factory.cc

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)

Patch Set: merge Created 3 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: ash/common/mojo_interface_factory.cc

diff --git a/ash/common/mojo_interface_factory.cc b/ash/common/mojo_interface_factory.cc

index 501c00657dfddb4bc3a638109307c82a8af5a465..f0742918eeea52184af6602bdbe9c28a4a52a61d 100644

--- a/ash/common/mojo_interface_factory.cc

+++ b/ash/common/mojo_interface_factory.cc

@@ -20,6 +20,7 @@

#include "ash/common/wallpaper/wallpaper_controller.h"

#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"

#include "ash/common/wm_shell.h"

+#include "ash/shell.h"

#include "base/bind.h"

#include "services/service_manager/public/cpp/interface_registry.h"

#include "ui/app_list/presenter/app_list.h"

@@ -85,7 +86,7 @@ void BindVpnListRequestOnMainThread(mojom::VpnListRequest request) {

void BindWallpaperRequestOnMainThread(

mojom::WallpaperControllerRequest request) {

- WmShell::Get()->wallpaper_controller()->BindRequest(std::move(request));

+ Shell::GetInstance()->wallpaper_controller()->BindRequest(std::move(request));

}

} // namespace

« no previous file with comments | « ash/common/keyboard/keyboard_ui.cc ('k') | ash/common/shelf/shelf_widget.cc » ('j') | no next file with comments »