Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(994)

Unified Diff: extensions/browser/api/guest_view/web_view/web_view_internal_api.cc

Issue 2360073002: [Extensions] Isolate ExtensionFunction results_ and error_ (Closed)
Patch Set: lazyboy's Created 4 years, 3 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
Index: extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
diff --git a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
index 9faea241be30613b9270c2633709e4cb932939f7..790f767efa33d5bd512a4b60ae2c7842afbb7251 100644
--- a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
+++ b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
@@ -515,11 +515,12 @@ WebViewInternalAddContentScriptsFunction::Run() {
HostID host_id = GenerateHostIDFromEmbedder(extension(), sender_web_contents);
bool incognito_enabled = browser_context()->IsOffTheRecord();
+ std::string error;
std::unique_ptr<UserScriptList> result =
ParseContentScripts(params->content_script_list, extension(), host_id,
- incognito_enabled, owner_base_url, &error_);
+ incognito_enabled, owner_base_url, &error);
if (!result)
- return RespondNow(Error(error_));
+ return RespondNow(Error(error));
WebViewContentScriptManager* manager =
WebViewContentScriptManager::Get(browser_context());
@@ -782,11 +783,12 @@ WebViewInternalLoadDataWithBaseUrlFunction::Run() {
std::string virtual_url =
params->virtual_url ? *params->virtual_url : params->data_url;
+ std::string error;
bool successful = guest_->LoadDataWithBaseURL(
- params->data_url, params->base_url, virtual_url, &error_);
+ params->data_url, params->base_url, virtual_url, &error);
if (successful)
return RespondNow(NoArguments());
- return RespondNow(Error(error_));
+ return RespondNow(Error(error));
}
WebViewInternalGoFunction::WebViewInternalGoFunction() {
« no previous file with comments | « extensions/browser/api/guest_view/web_view/web_view_internal_api.h ('k') | extensions/browser/api/hid/hid_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698