Adding run_at to chrome.tabs.executeScript/insertCss.

chrome/browser/chromeos/accessibility/accessibility_util.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/chromeos/accessibility/accessibility_util.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/file_reader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api_platform.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
+#include "chrome/common/extensions/user_script.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::RenderViewHost;
@@ skipping 34 matching lines @@
   }
 
  private:
   void OnFileLoaded(bool success, const std::string& data) {
     if (success) {
       ExtensionMsg_ExecuteCode_Params params;
       params.request_id = 0;
       params.extension_id = extension_id_;
       params.is_javascript = true;
       params.code = data;
+      params.run_at = UserScript::DOCUMENT_IDLE;
       params.all_frames = true;
       params.in_main_world = false;
       render_view_host_->Send(new ExtensionMsg_ExecuteCode(
           render_view_host_->GetRoutingID(), params));
     }
     Run();
   }
 
   std::string extension_id_;
   RenderViewHost* render_view_host_;
@@ skipping 19 matching lines @@
   Speak(l10n_util::GetStringUTF8(
       enabled ? IDS_CHROMEOS_ACC_SPOKEN_FEEDBACK_ENABLED :
       IDS_CHROMEOS_ACC_SPOKEN_FEEDBACK_DISABLED).c_str());
 
   // Load/Unload ChromeVox
   Profile* profile = ProfileManager::GetDefaultProfile();
   ExtensionService* extension_service =
       profile->GetExtensionService();
   FilePath path = FilePath(extension_misc::kAccessExtensionPath)
       .AppendASCII(extension_misc::kChromeVoxDirectoryName);
-  if (enabled) { // Load ChromeVox
+  if (enabled) {  // Load ChromeVox
     const Extension* extension =
         extension_service->component_loader()->Add(IDR_CHROMEVOX_MANIFEST,
                                                    path);
 
     if (login_web_ui) {
       RenderViewHost* render_view_host =
           login_web_ui->GetWebContents()->GetRenderViewHost();
       // Set a flag to tell ChromeVox that it's just been enabled,
       // so that it won't interrupt our speech feedback enabled message.
       ExtensionMsg_ExecuteCode_Params params;
       params.request_id = 0;
       params.extension_id = extension->id();
       params.is_javascript = true;
       params.code = "window.INJECTED_AFTER_LOAD = true;";
+      params.run_at = UserScript::DOCUMENT_IDLE;
       params.all_frames = true;
       params.in_main_world = false;
       render_view_host->Send(new ExtensionMsg_ExecuteCode(
           render_view_host->GetRoutingID(), params));
 
       // Inject ChromeVox' content scripts.
       ContentScriptLoader* loader = new ContentScriptLoader(
           extension->id(), render_view_host);
 
       for (size_t i = 0; i < extension->content_scripts().size(); i++) {
         const UserScript& script = extension->content_scripts()[i];
         for (size_t j = 0; j < script.js_scripts().size(); ++j) {
           const UserScript::File &file = script.js_scripts()[j];
           ExtensionResource resource = extension->GetResource(
               file.relative_path());
           loader->AppendScript(resource);
         }
       }
       loader->Run();  // It cleans itself up when done.
     }
 
     DLOG(INFO) << "ChromeVox was Loaded.";
-  } else { // Unload ChromeVox
+  } else {  // Unload ChromeVox
     extension_service->component_loader()->Remove(path);
     DLOG(INFO) << "ChromeVox was Unloaded.";
   }
 }
 
 void EnableHighContrast(bool enabled) {
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kHighContrastEnabled, enabled);
   pref_service->CommitPendingWrite();
 }
@@ skipping 37 matching lines @@
   return spoken_feedback_enabled;
 }
 
 void MaybeSpeak(const std::string& utterance) {
   if (IsSpokenFeedbackEnabled())
     Speak(utterance);
 }
 
 }  // namespace accessibility
 }  // namespace chromeos