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

Unified Diff: extensions/browser/api/execute_code_function.cc

Issue 2630753003: Separate validation failures from other failures in ExecuteCodeFunction. (Closed)
Patch Set: address comments Created 3 years, 11 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/execute_code_function.cc
diff --git a/extensions/browser/api/execute_code_function.cc b/extensions/browser/api/execute_code_function.cc
index d1b1ee3a8fe0f37e5c44932ec50d2785d554cfc7..0f2dd5f09f3bb39c867d8b3f15b1afa1cf94670d 100644
--- a/extensions/browser/api/execute_code_function.cc
+++ b/extensions/browser/api/execute_code_function.cc
@@ -163,7 +163,13 @@ bool ExecuteCodeFunction::HasPermission() {
}
bool ExecuteCodeFunction::RunAsync() {
- EXTENSION_FUNCTION_VALIDATE(Init());
+ InitResult init_result = Init();
+ EXTENSION_FUNCTION_VALIDATE(init_result != VALIDATION_FAILURE);
+ if (init_result == FAILURE) {
+ if (init_error_)
+ SetError(init_error_.value());
+ return false;
+ }
if (!details_->code.get() && !details_->file.get()) {
error_ = kNoCodeOrFileToExecuteError;
« no previous file with comments | « extensions/browser/api/execute_code_function.h ('k') | extensions/browser/api/guest_view/web_view/web_view_internal_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698