Merge 32634 - Make executeScript and insertCSS inject code into all frames....

chrome/browser/extensions/execute_code_in_tab_function.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/extensions/execute_code_in_tab_function.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/file_reader.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 
 namespace keys = extension_tabs_module_constants;
 
 const wchar_t* kCodeKey = L"code";
 const wchar_t* kFileKey = L"file";
+const wchar_t* kAllFramesKey = L"allFrames";
 
 bool ExecuteCodeInTabFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_LIST));
   const ListValue* args = args_as_list();
 
   DictionaryValue* script_info;
   EXTENSION_FUNCTION_VALIDATE(args->GetDictionary(1, &script_info));
   size_t number_of_value = script_info->GetSize();
   if (number_of_value == 0) {
     error_ = keys::kNoCodeOrFileToExecuteError;
     return false;
-  } else if (number_of_value > 1) {
-    error_ = keys::kMoreThanOneValuesError;
-    return false;
+  } else {
+    bool has_code = script_info->HasKey(kCodeKey);
+    bool has_file = script_info->HasKey(kFileKey);
+    if (has_code && has_file) {
+      error_ = keys::kMoreThanOneValuesError;
+      return false;
+    } else if (!has_code && !has_file) {
+      error_ = keys::kNoCodeOrFileToExecuteError;
+      return false;
+    }
   }
 
   execute_tab_id_ = -1;
   Browser* browser = NULL;
   TabContents* contents = NULL;
 
   // If |tab_id| is specified, look for it. Otherwise default to selected tab
   // in the current window.
   Value* tab_value = NULL;
   EXTENSION_FUNCTION_VALIDATE(args->Get(0, &tab_value));
@@ skipping 15 matching lines @@
 
   DCHECK(browser);
   DCHECK(contents);
 
   if (!GetExtension()->CanAccessHost(contents->GetURL())) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         keys::kCannotAccessPageError, contents->GetURL().spec());
     return false;
   }
 
+  if (script_info->HasKey(kAllFramesKey)) {
+    if (!script_info->GetBoolean(kAllFramesKey, &all_frames_))
+      return false;
+  }
+
   std::string code_string;
   if (script_info->HasKey(kCodeKey)) {
     if (!script_info->GetString(kCodeKey, &code_string))
       return false;
   }
 
   if (!code_string.empty()) {
     Execute(code_string);
     return true;
   }
@@ skipping 47 matching lines @@
   std::string function_name = name();
   if (function_name == TabsInsertCSSFunction::function_name()) {
     is_js_code = false;
   } else if (function_name != TabsExecuteScriptFunction::function_name()) {
     DCHECK(false);
   }
   registrar_.Add(this, NotificationType::TAB_CODE_EXECUTED,
                  NotificationService::AllSources());
   AddRef();  // balanced in Observe()
   contents->ExecuteCode(request_id(), extension_id(), is_js_code,
-                        code_string);
+                        code_string, all_frames_);
 }
 
 void ExecuteCodeInTabFunction::Observe(NotificationType type,
                                        const NotificationSource& source,
                                        const NotificationDetails& details) {
   std::pair<int, bool>* result_details =
       Details<std::pair<int, bool> >(details).ptr();
   if (result_details->first == request_id()) {
     SendResponse(result_details->second);
     Release();  // balanced in Execute()
   }
 }