ash/shelf/shelf_view.cc - Issue 1119983006: [ash/shelf] ResourceBundle should be used as pointer not non-const ref

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 1119983006: [ash/shelf] ResourceBundle should be used as pointer not non-const ref (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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:

View side-by-side diff with in-line comments

Download patch

Index: ash/shelf/shelf_view.cc

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

index f46233c74f0a3d2c5ff0e13779108f2fb591e263..3dc58fd33a6b640298ccdcaa36cdf59dcac25c05 100644

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

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

@@ -172,8 +172,8 @@ const gfx::FontList* ShelfMenuModelAdapter::GetLabelFontList(

if (command_id != kCommandIdOfMenuName)

return MenuModelAdapter::GetLabelFontList(command_id);

- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

- return &rb.GetFontList(ui::ResourceBundle::BoldFont);

+ ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();

+ return &rb->GetFontList(ui::ResourceBundle::BoldFont);

}

bool ShelfMenuModelAdapter::IsCommandEnabled(int id) const {

« no previous file with comments | « ash/shelf/overflow_button.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | no next file with comments »