Adding run_at to chrome.tabs.executeScript/insertCss.

chrome/browser/extensions/execute_code_in_tab_function.cc

 // Copyright (c) 2011 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/bind.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.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/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_message_bundle.h"
 #include "chrome/common/extensions/extension_messages.h"
+#include "chrome/common/extensions/user_script.h"

[Aaron Boodman, 2012/03/03 00:59:10]

Since you include the header in the .h file, it is not needed here.

[eaugusti, 2012/03/27 00:43:33]

Done.

 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
 using content::BrowserThread;
 
 namespace keys = extension_tabs_module_constants;
 
 ExecuteCodeInTabFunction::ExecuteCodeInTabFunction()
     : execute_tab_id_(-1),
-      all_frames_(false) {
+      all_frames_(false),
+      run_at_(UserScript::DOCUMENT_IDLE) {
 }
 
 ExecuteCodeInTabFunction::~ExecuteCodeInTabFunction() {
 }
 
 bool ExecuteCodeInTabFunction::RunImpl() {
   DictionaryValue* script_info;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &script_info));
   size_t number_of_value = script_info->size();
   if (number_of_value == 0) {
@@ skipping 43 matching lines @@
   if (!GetExtension()->CanExecuteScriptOnPage(
           contents->web_contents()->GetURL(), NULL, &error_)) {
     return false;
   }
 
   if (script_info->HasKey(keys::kAllFramesKey)) {
     if (!script_info->GetBoolean(keys::kAllFramesKey, &all_frames_))
       return false;
   }
 
+  if (script_info->HasKey(keys::kRunAtKey)) {
+    std::string run_string;
+    if (!script_info->GetString(keys::kRunAtKey, &run_string))

[Aaron Boodman, 2012/03/03 00:59:10]

You can do:

EXTENSION_FUNCTION_VALIDATE(script_info->GetString(...));

That macro should be used in cases where the json schema validation should have
caught the error (as opposed to higher level errors like 'the tab you specified
does not exist').

[eaugusti, 2012/03/27 00:43:33]

Done.

+      return false;
+
+    if (run_string == keys::kRunAtNow)
+      run_at_ = UserScript::DOCUMENT_NOW;
+    else if (run_string == keys::kRunAtDocumentStart)
+      run_at_ = UserScript::DOCUMENT_START;
+    else if (run_string == keys::kRunAtDocumentEnd)
+      run_at_ = UserScript::DOCUMENT_END;
+    else if (run_string == keys::kRunAtDocumentIdle)
+      run_at_ = UserScript::DOCUMENT_IDLE;
+    else
+      return false;

[Aaron Boodman, 2012/03/03 00:59:10]

same here, this can be EXTENSION_FUNCTION_VALIDATE(false);

[eaugusti, 2012/03/27 00:43:33]

Done.

+  }
+
   std::string code_string;
   if (script_info->HasKey(keys::kCodeKey)) {
     if (!script_info->GetString(keys::kCodeKey, &code_string))
       return false;
   }
 
   if (!code_string.empty()) {
     if (!Execute(code_string))
       return false;
     return true;
@@ skipping 107 matching lines @@
   } else if (function_name != TabsExecuteScriptFunction::function_name()) {
     DCHECK(false);
   }
 
   ExtensionMsg_ExecuteCode_Params params;
   params.request_id = request_id();
   params.extension_id = extension->id();
   params.is_javascript = is_js_code;
   params.code = code_string;
   params.all_frames = all_frames_;
+  params.run_at = run_at_;
   params.in_main_world = false;
   contents->web_contents()->GetRenderViewHost()->Send(
       new ExtensionMsg_ExecuteCode(
           contents->web_contents()->GetRenderViewHost()->routing_id(), params));
 
   Observe(contents->web_contents());
   AddRef();  // balanced in OnExecuteCodeFinished()
   return true;
 }
 
@@ skipping 24 matching lines @@
   if (!error.empty()) {
     CHECK(!success);
     error_ = error;
   }
 
   SendResponse(success);
 
   Observe(NULL);
   Release();  // balanced in Execute()
 }