athena/wm/window_overview_mode.cc - Issue 620663005: Lock screen for Chrome-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: athena/wm/window_overview_mode.cc

Issue 620663005: Lock screen for Chrome-Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: comments resolved 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:

Index: athena/wm/window_overview_mode.cc

diff --git a/athena/wm/window_overview_mode.cc b/athena/wm/window_overview_mode.cc

index b8b10314eb9cd03653d8b617e09cfbbad4bd9a59..4bcedbe5529a9a3885309dfb61750cb5dd231b5f 100644

--- a/athena/wm/window_overview_mode.cc

+++ b/athena/wm/window_overview_mode.cc

@@ -430,7 +430,8 @@ class WindowOverviewModeImpl : public WindowOverviewMode,

targeter->FindTargetForLocatedEvent(container_, event));

while (target && target->parent() != container_)

target = target->parent();

- aura::Window* transient_parent = wm::GetTransientParent(target);

+ aura::Window* transient_parent =

+ target ? wm::GetTransientParent(target) : NULL;

return transient_parent ? transient_parent : target;

}