Add frameId to chrome.tabs.executeScript/insertCSS

extensions/browser/script_executor.h

Index: extensions/browser/script_executor.h
diff --git a/extensions/browser/script_executor.h b/extensions/browser/script_executor.h
index 4f81b78fb62dfe17964aa2600e57b5cbf0c4c6fe..bea6a88d24cc66bfc78d0edc16701c3ae28ba4dc 100644
--- a/extensions/browser/script_executor.h
+++ b/extensions/browser/script_executor.h
@@ -44,7 +44,7 @@ class ScriptExecutor {
 
   // The scope of the script injection across the frames.
   enum FrameScope {
-    TOP_FRAME,
+    SINGLE_FRAME,
     ALL_FRAMES,

[Devlin, 2016/01/26 20:40:36]

"ALL_FRAMES" is also wrong, now - it should be CHILD_ or SUB_FRAMES or something
along those lines (should just be a find-replace - if for whatever reason it's
more complicated, feel free to postpone to a later CL).

[robwu, 2016/01/26 23:57:59]

Done. INCLUDE_SUB_FRAMES

   };
 
@@ -82,6 +82,10 @@ class ScriptExecutor {
   // Executes a script. The arguments match ExtensionMsg_ExecuteCode_Params in
   // extension_messages.h (request_id is populated automatically).
   //
+  // The script will be executed in the frame identified by |frame_id| (which is
+  // an extension API frame ID). If |frame_scope| is ALL_FRAMES, then the script
+  // will also be executed in all descendants of the frame.
+  //
   // |callback| will always be called even if the IPC'd renderer is destroyed
   // before a response is received (in this case the callback will be with a
   // failure and appropriate error message).
@@ -89,6 +93,7 @@ class ScriptExecutor {
                      ScriptType script_type,
                      const std::string& code,
                      FrameScope frame_scope,
+                     int frame_id,
                      MatchAboutBlank match_about_blank,
                      UserScript::RunLocation run_at,
                      WorldType world_type,