chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc - Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*"

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/chromeos/extensions/file_manager/file_manager_util.cc

Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 6 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/chromeos/extensions/file_manager/file_handler_util.cc ('k') | chrome/browser/chromeos/extensions/file_manager/zip_file_creator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc

diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc

index 81b8198c1bd460f9e69743b218113051e55dc06e..31d0d31402373e9a126ce460e83ab9080d637a8f 100644

--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc

+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc

@@ -131,8 +131,8 @@ bool IsPepperPluginEnabled(Profile* profile,

if (!pepper_info)

return false;

- PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(profile);

- if (!plugin_prefs)

+ scoped_refptr<PluginPrefs> plugin_prefs = PluginPrefs::GetForProfile(profile);

+ if (!plugin_prefs.get())

return false;

return plugin_prefs->IsPluginEnabled(pepper_info->ToWebPluginInfo());

@@ -348,7 +348,7 @@ bool ExecuteDefaultAppHandler(Profile* profile,

for (ExtensionSet::const_iterator iter = service->extensions()->begin();

iter != service->extensions()->end();

++iter) {

- const Extension* extension = *iter;

+ const Extension* extension = iter->get();

// We don't support using hosted apps to open files.

if (!extension->is_platform_app())