Adding run_at to chrome.tabs.executeScript/insertCss.

chrome/browser/extensions/execute_code_in_tab_function.cc

 // Copyright (c) 2012 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"
@@ skipping 13 matching lines @@
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/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;
+    EXTENSION_FUNCTION_VALIDATE(script_info->GetString(
+          keys::kRunAtKey, &run_string));
+
+    if (run_string == extension_manifest_values::kRunAtDocumentStart)
+      run_at_ = UserScript::DOCUMENT_START;
+    else if (run_string == extension_manifest_values::kRunAtDocumentEnd)
+      run_at_ = UserScript::DOCUMENT_END;
+    else if (run_string == extension_manifest_values::kRunAtDocumentIdle)
+      run_at_ = UserScript::DOCUMENT_IDLE;
+    else
+      EXTENSION_FUNCTION_VALIDATE(false);
+  }
+
   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()->GetRoutingID(),
           params));
 
   Observe(contents->web_contents());
   AddRef();  // balanced in OnExecuteCodeFinished()
   return true;
 }
@@ skipping 25 matching lines @@
   if (!error.empty()) {
     CHECK(!success);
     error_ = error;
   }
 
   SendResponse(success);
 
   Observe(NULL);
   Release();  // balanced in Execute()
 }