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

Unified Diff: chrome/browser/extensions/script_executor.h

Issue 22875046: Don't serialize extension user script injection results unless the extension (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sensible v8::Context-ness Created 7 years, 4 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/tabs/tabs_api.cc ('k') | chrome/browser/extensions/script_executor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/script_executor.h
diff --git a/chrome/browser/extensions/script_executor.h b/chrome/browser/extensions/script_executor.h
index d463bf0d5a85a122cdc6f808a0cae1c39ec3402e..5db316fbc14536dc0892c2992f986af86a7230e3 100644
--- a/chrome/browser/extensions/script_executor.h
+++ b/chrome/browser/extensions/script_executor.h
@@ -55,6 +55,18 @@ class ScriptExecutor {
ISOLATED_WORLD,
};
+ // The type of process the target is.
+ enum ProcessType {
+ DEFAULT_PROCESS,
+ WEB_VIEW_PROCESS,
+ };
+
+ // The type of result the caller is interested in.
+ enum ResultType {
+ NO_RESULT,
+ JSON_SERIALIZED_RESULT,
+ };
+
// Callback from ExecuteScript. The arguments are (error, on_page_id, on_url,
// result). Success is implied by an empty error.
typedef base::Callback<void(const std::string&, int32, const GURL&,
@@ -73,7 +85,8 @@ class ScriptExecutor {
FrameScope frame_scope,
UserScript::RunLocation run_at,
WorldType world_type,
- bool is_web_view,
+ ProcessType process_type,
+ ResultType result_type,
const ExecuteScriptCallback& callback);
private:
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | chrome/browser/extensions/script_executor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698