chrome/browser/automation/testing_automation_provider.cc - Issue 9500020: ProtectorService supports multiple change instances.

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/automation/testing_automation_provider.cc

Issue 9500020: ProtectorService supports multiple change instances. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge Created 8 years, 10 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:

Index: chrome/browser/automation/testing_automation_provider.cc

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc

index afc251a4d660590022094a732d548c3ad5f630a6..b10ba5e5b75418331d0ae00cef0c2df23a67c2a3 100644

--- a/chrome/browser/automation/testing_automation_provider.cc

+++ b/chrome/browser/automation/testing_automation_provider.cc

@@ -3462,10 +3462,12 @@ void TestingAutomationProvider::PerformProtectorAction(

reply.SendError("Missing 'action' value");

return;

}

+ protector::BaseSettingChange* change =

+ protector_service->GetLastChange();

if (action == "apply_change")

- protector_service->ApplyChange(browser);

+ protector_service->ApplyChange(change, browser);

else if (action == "discard_change")

- protector_service->DiscardChange(browser);

+ protector_service->DiscardChange(change, browser);

else

return reply.SendError("Invalid 'action' value");

reply.SendSuccess(NULL);