chrome/browser/ui/views/location_bar/origin_chip_view.cc - Issue 505913002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/ui/

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/views/location_bar/origin_chip_view.cc

Issue 505913002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« chrome/browser/ui/location_bar/location_bar.cc ('K') | « chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc ('k') | chrome/browser/ui/views/signed_certificate_timestamps_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/origin_chip_view.cc

diff --git a/chrome/browser/ui/views/location_bar/origin_chip_view.cc b/chrome/browser/ui/views/location_bar/origin_chip_view.cc

index 5dc5eecae35ad38d17e91a8a0723f28888f1c560..ddc6127ea19e6219f8c58ccf5ca3f42fcdb26b5b 100644

--- a/chrome/browser/ui/views/location_bar/origin_chip_view.cc

+++ b/chrome/browser/ui/views/location_bar/origin_chip_view.cc

@@ -150,7 +150,7 @@ OriginChipView::OriginChipView(LocationBarView* location_bar_view,

scoped_refptr<SafeBrowsingService> sb_service =

g_browser_process->safe_browsing_service();

// |sb_service| may be NULL in tests.

- if (sb_service && sb_service->ui_manager())

+ if (sb_service.get() && sb_service->ui_manager().get())

sb_service->ui_manager()->AddObserver(this);

SetFontList(font_list);

@@ -182,7 +182,7 @@ OriginChipView::OriginChipView(LocationBarView* location_bar_view,

OriginChipView::~OriginChipView() {

scoped_refptr<SafeBrowsingService> sb_service =

g_browser_process->safe_browsing_service();

- if (sb_service.get() && sb_service->ui_manager())

+ if (sb_service.get() && sb_service->ui_manager().get())

sb_service->ui_manager()->RemoveObserver(this);

}