chrome/browser/extensions/shell_window_registry.cc - Issue 12210107: Fix issue 174250, crash when reloading packaged app.

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/extensions/shell_window_registry.cc

Issue 12210107: Fix issue 174250, crash when reloading packaged app. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 7 years, 10 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/extensions/shell_window_registry.cc

diff --git a/chrome/browser/extensions/shell_window_registry.cc b/chrome/browser/extensions/shell_window_registry.cc

index f7495f83e8a41dae477b8695fefbd753b2ea7506..4f7a87384dc33702ced00a6f0726f7c7efc88d46 100644

--- a/chrome/browser/extensions/shell_window_registry.cc

+++ b/chrome/browser/extensions/shell_window_registry.cc

@@ -67,8 +67,9 @@ void ShellWindowRegistry::ShellWindowIconChanged(ShellWindow* shell_window) {

}

void ShellWindowRegistry::RemoveShellWindow(ShellWindow* shell_window) {

- shell_windows_.erase(shell_window);

- FOR_EACH_OBSERVER(Observer, observers_, OnShellWindowRemoved(shell_window));

+ size_t num_erased = shell_windows_.erase(shell_window);

+ if (num_erased > 0)

+ FOR_EACH_OBSERVER(Observer, observers_, OnShellWindowRemoved(shell_window));

}

void ShellWindowRegistry::AddObserver(Observer* observer) {