chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h - Issue 1823923002: arc: Support running Arc app in shelf

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.h

Issue 1823923002: arc: Support running Arc app in shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase, tests, cleanup 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

« chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc ('K') | « chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc » ('j') | components/arc/test/fake_app_instance.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ef8576979ac9790e5bfdde3aa19b01de166faccb..e910158dd3aaed65cb61eead5c7a609d7dd3437a 100644

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

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

@@ -6,12 +6,12 @@

#define CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_APP_WINDOW_LAUNCHER_CONTROLLER_H_

#include "base/macros.h"

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

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

// Inherits from AppWindowLauncherController and overwrites the AppWindow

// observing functions to switch between users dynamically.

class MultiProfileAppWindowLauncherController

- : public AppWindowLauncherController {

+ : public ExtensionAppWindowLauncherController {

public:

explicit MultiProfileAppWindowLauncherController(

ChromeLauncherController* owner);