Add frameId to chrome.tabs.executeScript/insertCSS

extensions/browser/script_executor.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXTENSIONS_BROWSER_SCRIPT_EXECUTOR_H_
 #define EXTENSIONS_BROWSER_SCRIPT_EXECUTOR_H_
 
 #include "base/callback_forward.h"
 #include "base/observer_list.h"
 #include "extensions/common/user_script.h"
@@ skipping 26 matching lines @@
   ~ScriptExecutor();
 
   // The type of script being injected.
   enum ScriptType {
     JAVASCRIPT,
     CSS,
   };
 
   // The scope of the script injection across the frames.
   enum FrameScope {
-    TOP_FRAME,
-    ALL_FRAMES,
+    SINGLE_FRAME,
+    INCLUDE_SUB_FRAMES,
   };
 
   // Whether to insert the script in about: frames when its origin matches
   // the extension's host permissions.
   enum MatchAboutBlank {
     DONT_MATCH_ABOUT_BLANK,
     MATCH_ABOUT_BLANK,
   };
 
   // The type of world to inject into (main world, or its own isolated world).
@@ skipping 16 matching lines @@
 
   // Callback from ExecuteScript. The arguments are (error, on_url, result).
   // Success is implied by an empty error.
   typedef base::Callback<
       void(const std::string&, const GURL&, const base::ListValue&)>
       ExecuteScriptCallback;
 
   // 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

[Devlin, 2016/02/01 19:04:07]

nit: s/ALL_FRAMES/INCLUDE_SUB_FRAMES

[robwu, 2016/02/02 15:28:19]

Done.

+  // 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).
   void ExecuteScript(const HostID& host_id,
                      ScriptType script_type,
                      const std::string& code,
                      FrameScope frame_scope,
+                     int frame_id,
                      MatchAboutBlank match_about_blank,
                      UserScript::RunLocation run_at,
                      WorldType world_type,
                      ProcessType process_type,
                      const GURL& webview_src,
                      const GURL& file_url,
                      bool user_gesture,
                      ResultType result_type,
                      const ExecuteScriptCallback& callback);
 
  private:
   // The next value to use for request_id in ExtensionMsg_ExecuteCode_Params.
   int next_request_id_;
 
   content::WebContents* web_contents_;
 
   base::ObserverList<ScriptExecutionObserver>* script_observers_;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_SCRIPT_EXECUTOR_H_