ash/common/shelf/shelf_view.cc - Issue 2627533002: Replace ShelfItemDelegate::GetTitle() with ShelfItem::title.

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

Issue 2627533002: Replace ShelfItemDelegate::GetTitle() with ShelfItem::title. (Closed)

Patch Set: Address comments. Created 3 years, 11 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/common/shelf/shelf_view.cc

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

index 5a6bfaa6263e7e25ce84b25744ba31734f18d7d1..48458db58ec18c3b5c6ae0b433e18c0a906dce2f 100644

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

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

@@ -527,9 +527,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 || !model_->GetShelfItemDelegate(item->id))

- return base::string16();

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

+ return item ? item->title : base::string16();

}

gfx::Rect ShelfView::GetVisibleItemsBoundsInScreen() {

« no previous file with comments | « ash/common/shelf/shelf_model.cc ('k') | ash/common/shelf/shelf_window_watcher.h » ('j') | no next file with comments »