chrome/browser/themes/browser_theme_pack.cc - Issue 1803263002: base: Make RefCountedBytes::TakeVector return ref ptr instead of raw ptr

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/themes/browser_theme_pack.cc

Issue 1803263002: base: Make RefCountedBytes::TakeVector return ref ptr instead of raw ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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

« no previous file with comments | « chrome/browser/printing/print_preview_message_handler.cc ('k') | chrome/browser/ui/webui/print_preview/print_preview_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/themes/browser_theme_pack.cc

diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc

index 3f2837e8988911c7efee1b58bf0d6f8d27a56a43..55587a9e038e48fed8c918e9cd88ac8bb9e83817 100644

--- a/chrome/browser/themes/browser_theme_pack.cc

+++ b/chrome/browser/themes/browser_theme_pack.cc

@@ -389,7 +389,7 @@ bool HasFrameBorder() {

}

// Returns a piece of memory with the contents of the file |path|.

-base::RefCountedMemory* ReadFileData(const base::FilePath& path) {

+scoped_refptr<base::RefCountedMemory> ReadFileData(const base::FilePath& path) {

if (!path.empty()) {

base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ);

if (file.IsValid()) {

@@ -405,7 +405,7 @@ base::RefCountedMemory* ReadFileData(const base::FilePath& path) {

}

- return NULL;

+ return nullptr;

}

// Shifts an image's HSL values. The caller is responsible for deleting