chrome/browser/ui/ash/chrome_shell_delegate.cc - Issue 1866403006: Revert of AppListController refactoring part 3: Switching over to use AppListShower in Ash.

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/chrome_shell_delegate.cc

Issue 1866403006: Revert of AppListController refactoring part 3: Switching over to use AppListShower in Ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus_chrome_delegates_ash_impl

Patch Set: Created 4 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/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f3da988f2b913a0b55399b8975807b080de09083..22398abc65ab95e1be89deb27de67fb0b4e08035 100644

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

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

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

#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"

#include "chrome/grit/chromium_strings.h"

#include "grit/theme_resources.h"

-#include "ui/app_list/shower/app_list_shower.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

@@ -140,9 +139,10 @@

displayer.browser()->window()->GetNativeWindow());

}

-app_list::AppListShower* ChromeShellDelegate::GetAppListShower() {

+app_list::AppListViewDelegate* ChromeShellDelegate::GetAppListViewDelegate() {

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

- return AppListServiceAsh::GetInstance()->GetAppListShower();

+ return AppListServiceAsh::GetInstance()->GetViewDelegate(

+ Profile::FromBrowserContext(GetActiveBrowserContext()));

}

ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(