chrome/browser/ui/ash/launcher/extension_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/extension_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/extension_app_window_launcher_controller.h ('k') | chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7e5db0b16f8984f98d61f3bbe5497a331610c811..1e0671732cdbb1c0120906da54121007be8f9530 100644

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

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

@@ -11,7 +11,7 @@

#include "base/stl_util.h"

#include "base/strings/stringprintf.h"

#include "chrome/browser/profiles/profile.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/launcher/extension_app_window_launcher_item_controller.h"

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

#include "extensions/browser/app_window/app_window.h"

@@ -50,7 +50,7 @@ std::string GetAppShelfId(AppWindow* app_window) {

} // namespace

ExtensionAppWindowLauncherController::ExtensionAppWindowLauncherController(

- ChromeLauncherControllerImpl* owner)

+ ChromeLauncherController* owner)

: AppWindowLauncherController(owner) {

AppWindowRegistry* registry = AppWindowRegistry::Get(owner->profile());

registry_.insert(registry);