chrome/browser/ui/ash/ash_util.cc - Issue 855753004: Remove remainder of Athena related code from Chrome

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

Issue 855753004: Remove remainder of Athena related code from Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_USE_ATHENA5

Patch Set: Created 5 years, 11 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

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

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

index 5608e8208fd142e3b18f25c29276a8474423063c..3b72621e6afeb8b1d4cb34445cb304912b0ae17b 100644

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

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

@@ -27,8 +27,8 @@ bool ShouldOpenAshOnStartup() {

bool IsNativeViewInAsh(gfx::NativeView native_view) {

#if defined(OS_CHROMEOS)

- // Optimization. There is only ash or only athena on ChromeOS.

- return ash::Shell::HasInstance();

+ // Optimization. There is only ash on ChromeOS.

+ return true;

#endif

if (!ash::Shell::HasInstance())

« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/athena/extensions/DEPS » ('j') | no next file with comments »