chrome/browser/ui/ash/chrome_shell_delegate.cc - Issue 634313004: Display dialog when app install succeeds / fails on Athena

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 634313004: Display dialog when app install succeeds / fails on Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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/BUILD.gn ('k') | chrome/browser/ui/athena/extensions/extension_install_ui_athena.h » ('j') | chrome/browser/ui/athena/extensions/extension_install_ui_athena.h » ('J')
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 3d47b36766ba9413f1314c52c1b1f76893f04744..38117659e42ba41a03397f5cddd45274ef7a1a8d 100644

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

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

@@ -101,9 +101,13 @@ content::BrowserContext* ChromeShellDelegate::GetActiveBrowserContext() {

}

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

+#if defined(USE_ATHENA)

+ return NULL;

+#else

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

return AppListServiceAsh::GetInstance()->GetViewDelegate(

Profile::FromBrowserContext(GetActiveBrowserContext()));

+#endif

}

ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(