chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc - Issue 2839933005: mash: Merge ChromeLauncherController and *Impl subclass.

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/launcher/multi_profile_app_window_launcher_controller.cc

Issue 2839933005: mash: Merge ChromeLauncherController and *Impl subclass. (Closed)

Patch Set: Address comments. Created 3 years, 8 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 | « chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h ('k') | chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc

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

index 2eefa3fb28ffdabde4c636d386fa334bd0f51434..f57876e6db8269859c6b8c9245bab50353bc075d 100644

--- a/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc

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

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

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

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

#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"

#include "components/signin/core/account_id/account_id.h"

@@ -15,7 +15,7 @@

#include "ui/aura/window.h"

MultiProfileAppWindowLauncherController::

- MultiProfileAppWindowLauncherController(ChromeLauncherControllerImpl* owner)

+ MultiProfileAppWindowLauncherController(ChromeLauncherController* owner)

: ExtensionAppWindowLauncherController(owner) {

// We might have already active windows.

extensions::AppWindowRegistry* registry =