Add frameId to executeScript/insertCSS

extensions/browser/api/execute_code_function.cc

 // 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_API_EXECUTE_CODE_FUNCTION_IMPL_H_
 #define EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
 
 #include "extensions/browser/api/execute_code_function.h"
 
 #include "extensions/browser/component_extension_resource_manager.h"
@@ skipping 121 matching lines @@
   if (!extension())
     return false;
 
   ScriptExecutor::ScriptType script_type = ScriptExecutor::JAVASCRIPT;
   if (ShouldInsertCSS())
     script_type = ScriptExecutor::CSS;
 
   ScriptExecutor::FrameScope frame_scope =
       details_->all_frames.get() && *details_->all_frames
           ? ScriptExecutor::ALL_FRAMES
-          : ScriptExecutor::TOP_FRAME;
+          : ScriptExecutor::ONE_FRAME;
+
+  // If a frame_id is given, use it. Otherwise, use the top-level frame (0).
+  int frame_id = details_->frame_id.get() ? *details_->frame_id : 0;
 
   ScriptExecutor::MatchAboutBlank match_about_blank =
       details_->match_about_blank.get() && *details_->match_about_blank
           ? ScriptExecutor::MATCH_ABOUT_BLANK
           : ScriptExecutor::DONT_MATCH_ABOUT_BLANK;
 
   UserScript::RunLocation run_at = UserScript::UNDEFINED;
   switch (details_->run_at) {
     case InjectDetails::RUN_AT_NONE:
     case InjectDetails::RUN_AT_DOCUMENT_IDLE:
       run_at = UserScript::DOCUMENT_IDLE;
       break;
     case InjectDetails::RUN_AT_DOCUMENT_START:
       run_at = UserScript::DOCUMENT_START;
       break;
     case InjectDetails::RUN_AT_DOCUMENT_END:
       run_at = UserScript::DOCUMENT_END;
       break;
   }
   CHECK_NE(UserScript::UNDEFINED, run_at);
 
   executor->ExecuteScript(
       extension()->id(),
       script_type,
       code_string,
       frame_scope,
+      frame_id,
       match_about_blank,
       run_at,
       ScriptExecutor::ISOLATED_WORLD,
       IsWebView() ? ScriptExecutor::WEB_VIEW_PROCESS
                   : ScriptExecutor::DEFAULT_PROCESS,
       GetWebViewSrc(),
       file_url_,
       user_gesture_,
       has_callback() ? ScriptExecutor::JSON_SERIALIZED_RESULT
                      : ScriptExecutor::NO_RESULT,
@@ skipping 58 matching lines @@
                                                 const base::ListValue& result) {
   if (!error.empty())
     SetError(error);
 
   SendResponse(error.empty());
 }
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_