Move CrxFile, FileReader, ExtensionResource to src/extensions.

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 <queue>
 
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.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/tts_controller.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/extensions/extension.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 "chrome/common/url_constants.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
+#include "extensions/browser/file_reader.h"
+#include "extensions/common/extension_resource.h"
 #include "googleurl/src/gurl.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;
 
 namespace chromeos {
 namespace accessibility {
 
 // Helper class that directly loads an extension's content scripts into
 // all of the frames corresponding to a given RenderViewHost.
 class ContentScriptLoader {
  public:
   // Initialize the ContentScriptLoader with the ID of the extension
   // and the RenderViewHost where the scripts should be loaded.
   ContentScriptLoader(const std::string& extension_id,
                       int render_process_id,
                       int render_view_id)
       : extension_id_(extension_id),
         render_process_id_(render_process_id),
         render_view_id_(render_view_id) {}
 
   // Call this once with the ExtensionResource corresponding to each
   // content script to be loaded.
-  void AppendScript(ExtensionResource resource) {
+  void AppendScript(extensions::ExtensionResource resource) {
     resources_.push(resource);
   }
 
   // Fianlly, call this method once to fetch all of the resources and
   // load them. This method will delete this object when done.
   void Run() {
     if (resources_.empty()) {
       delete this;
       return;
     }
 
-    ExtensionResource resource = resources_.front();
+    extensions::ExtensionResource resource = resources_.front();
     resources_.pop();
     scoped_refptr<FileReader> reader(new FileReader(resource, base::Bind(
         &ContentScriptLoader::OnFileLoaded, base::Unretained(this))));
     reader->Start();
   }
 
  private:
   void OnFileLoaded(bool success, const std::string& data) {
     if (success) {
       ExtensionMsg_ExecuteCode_Params params;
@@ skipping 11 matching lines @@
         render_view_host->Send(new ExtensionMsg_ExecuteCode(
             render_view_host->GetRoutingID(), params));
       }
     }
     Run();
   }
 
   std::string extension_id_;
   int render_process_id_;
   int render_view_id_;
-  std::queue<ExtensionResource> resources_;
+  std::queue<extensions::ExtensionResource> resources_;
 };
 
 void UpdateChromeOSAccessibilityHistograms() {
   UMA_HISTOGRAM_BOOLEAN("Accessibility.CrosSpokenFeedback",
                         IsSpokenFeedbackEnabled());
   UMA_HISTOGRAM_BOOLEAN("Accessibility.CrosHighContrast",
                         IsHighContrastEnabled());
   UMA_HISTOGRAM_BOOLEAN("Accessibility.CrosVirtualKeyboard",
                         IsVirtualKeyboardEnabled());
   if (MagnificationManager::Get()) {
@@ skipping 71 matching lines @@
 
       // Inject ChromeVox' content scripts.
       ContentScriptLoader* loader = new ContentScriptLoader(
           extension->id(), render_view_host->GetProcess()->GetID(),
           render_view_host->GetRoutingID());
 
       for (size_t i = 0; i < extension->content_scripts().size(); i++) {
         const extensions::UserScript& script = extension->content_scripts()[i];
         for (size_t j = 0; j < script.js_scripts().size(); ++j) {
           const extensions::UserScript::File &file = script.js_scripts()[j];
-          ExtensionResource resource = extension->GetResource(
+          extensions::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
     extension_service->component_loader()->Remove(path);
@@ skipping 81 matching lines @@
   if (IsSpokenFeedbackEnabled())
     Speak(utterance);
 }
 
 void ShowAccessibilityHelp(Browser* browser) {
   chrome::ShowSingletonTab(browser, GURL(chrome::kChromeAccessibilityHelpURL));
 }
 
 }  // namespace accessibility
 }  // namespace chromeos