chrome/browser/ui/ash/ash_util.cc - Issue 514293003: Run athena on 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 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed comments, rebase Created 6 years, 3 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:

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 3012ab3178bcde5ae94f56164a3cb5196873fdd1..de8b919cffa99b1d67f288192468f1344f6973fb 100644

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

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

@@ -13,8 +13,8 @@ namespace chrome {

bool IsNativeViewInAsh(gfx::NativeView native_view) {

#if defined(OS_CHROMEOS)

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

- return true;

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

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

#endif

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