ash/shelf/shelf_view.cc - Issue 1994253004: Speculative ShelfView::GetTitleForView crash fix.

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/shelf/shelf_view.cc

Issue 1994253004: Speculative ShelfView::GetTitleForView crash fix. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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: ash/shelf/shelf_view.cc

diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc

index d59ff70ae5017f478bb676ccea6c496387cdf5de..eb51808e66bcc22cb6da37bcb46ff192121f4311 100644

--- a/ash/shelf/shelf_view.cc

+++ b/ash/shelf/shelf_view.cc

@@ -542,7 +542,7 @@ bool ShelfView::ShouldShowTooltipForView(const views::View* view) const {

base::string16 ShelfView::GetTitleForView(const views::View* view) const {

const ShelfItem* item = ShelfItemForView(view);

- if (!item)

+ if (!item || !item_manager_ || !item_manager_->GetShelfItemDelegate(item->id))

sky 2016/05/19 20:54:48 The item_manager_ check seems unnecessary.

msw 2016/05/19 21:40:13 Done.

return base::string16();

return item_manager_->GetShelfItemDelegate(item->id)->GetTitle();

}

« no previous file with comments | « no previous file | no next file » | no next file with comments »