chrome/browser/extensions/api/content_settings/content_settings_api.cc - Issue 10694106: Added support for multiple parameters to Extension API callbacks.

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/extensions/api/content_settings/content_settings_api.cc

Issue 10694106: Added support for multiple parameters to Extension API callbacks. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Synced. Created 8 years, 5 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/extensions/api/browsing_data/browsing_data_test.cc ('k') | chrome/browser/extensions/api/cookies/cookies_api.cc » ('j') | chrome/browser/extensions/extension_function.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

index 9e16a45c33c3a10a4ec1e2cc175b34f01b4c1bc6..f2587b5ef68fafccbf3063224df54bf1d029e160 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

@@ -163,7 +163,7 @@ bool GetContentSettingFunction::RunImpl() {

result->SetString(keys::kContentSettingKey,

helpers::ContentSettingToString(setting));

- result_.reset(result);

+ SetResult(result);

return true;

}

@@ -283,7 +283,7 @@ void GetResourceIdentifiersFunction::OnGotPluginGroups(

dict->SetString(keys::kDescriptionKey, it->GetGroupName());

list->Append(dict);

}

- result_.reset(list);

+ SetResult(list);

BrowserThread::PostTask(

BrowserThread::UI, FROM_HERE, base::Bind(

&GetResourceIdentifiersFunction::SendResponse, this, true));