ash/wm/window_util.cc - Issue 9837046: Revert r128507 "Revert r128436 "relanding: disabled workspace_window_resizer test. fixed access-aft…

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: ash/wm/window_util.cc

Issue 9837046: Revert r128507 "Revert r128436 "relanding: disabled workspace_window_resizer test. fixed access-aft… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 9 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: ash/wm/window_util.cc

diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc

index fbba9ad7cebfa6242d67cc35dd0a142e49720b9f..4a94e1b957f0460ef60375898d2bcf52a2da5639 100644

--- a/ash/wm/window_util.cc

+++ b/ash/wm/window_util.cc

@@ -39,9 +39,9 @@ bool IsActiveWindow(aura::Window* window) {

DCHECK(window);

if (!window->GetRootWindow())

return false;

- return aura::client::GetActivationClient(window->GetRootWindow())->

- GetActiveWindow() == window;

+ aura::client::ActivationClient* client =

+ aura::client::GetActivationClient(window->GetRootWindow());

+ return client && client->GetActiveWindow() == window;

}

aura::Window* GetActiveWindow() {

« no previous file with comments | « ash/shell.cc ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »