chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc - Issue 2256273003: arc: Fix crash on window close (on close race condition).

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/launcher/arc_app_window_launcher_controller.cc

Issue 2256273003: arc: Fix crash on window close (on close race condition). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 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 | « no previous file | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

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

index a5d68fbea957f5b05f0ba48185d1ff4e1fafdcc5..8ccca6d8158d98a048a1e4b2c52d4bb0da445ccf 100644

--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

@@ -332,8 +332,10 @@ void ArcAppWindowLauncherController::OnWindowDestroying(aura::Window* window) {

window->RemoveObserver(this);

for (auto& it : task_id_to_app_window_) {

- if (it.second->widget() == views::Widget::GetWidgetForNativeWindow(window))

- it.second->set_widget(nullptr);

+ if (it.second->GetNativeWindow() == window) {

+ OnTaskDestroyed(it.second->task_id());

khmel 2016/08/18 16:09:29 Fix race condition on Close (Close event before On

+ break;

+ }

}