chrome/browser/ui/ash/ash_init.cc - Issue 2059963002: Mustash implementation of ChromeLauncherController.

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: chrome/browser/ui/ash/ash_init.cc

Issue 2059963002: Mustash implementation of ChromeLauncherController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@launcher_controller_mus_5

Patch Set: Addressing feedback. Created 4 years, 6 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

Index: chrome/browser/ui/ash/ash_init.cc

diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc

index 0ceb1aa4dc7a582ca5e223c940910e2cdac51dcd..40d9394c8247e11c1317870c6124fefebf6b0cce 100644

--- a/chrome/browser/ui/ash/ash_init.cc

+++ b/chrome/browser/ui/ash/ash_init.cc

@@ -39,7 +39,7 @@

#endif

#if defined(MOJO_SHELL_CLIENT)

-#include "chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h"

+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h"

#endif

namespace chrome {

@@ -101,7 +101,7 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {

void InitializeMash() {

#if defined(MOJO_SHELL_CLIENT)

DCHECK(!ash::Shell::HasInstance());

- ChromeMashShelfController::CreateInstance();

+ ChromeLauncherControllerMus::CreateInstance()->Init();

#endif

}

« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h » ('j') | no next file with comments »