Loads local resources from current locale subtree if available, if not it fal...

chrome/browser/extensions/user_script_master.cc

 // Copyright (c) 2008 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/user_script_master.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 118 matching lines @@
   else
     master_->NewScriptsAvailable(memory);
 
   // Drop our self-reference.
   // Balances StartScan().
   Release();
 }
 
 static bool LoadScriptContent(UserScript::File* script_file) {
   std::string content;
-  if (!file_util::ReadFileToString(script_file->path(), &content)) {
-    LOG(WARNING) << "Failed to load user script file: "
-                 << script_file->path().value();
+  FilePath path = script_file->resource().GetFilePath();
+  if (path.empty() || !file_util::ReadFileToString(path, &content)) {
+    LOG(WARNING) << "Failed to load user script file: " << path.value();
     return false;
   }
 
   script_file->set_content(content);
-  LOG(INFO) << "Loaded user script file: " << script_file->path().value();
+  LOG(INFO) << "Loaded user script file: " << path.value();
   return true;
 }
 
 void UserScriptMaster::ScriptReloader::LoadScriptsFromDirectory(
     const FilePath& script_dir, UserScriptList* result) {
-  // Clear the list. We will populate it with the scrips found in script_dir.
+  // Clear the list. We will populate it with the scripts found in script_dir.
   result->clear();
 
   // Find all the scripts in |script_dir|.
   if (!script_dir.value().empty()) {
     // Create the "<Profile>/User Scripts" directory if it doesn't exist
     if (!file_util::DirectoryExists(script_dir))
       file_util::CreateDirectory(script_dir);
 
     file_util::FileEnumerator enumerator(script_dir, false,
                                          file_util::FileEnumerator::FILES,
                                          FILE_PATH_LITERAL("*.user.js"));
     for (FilePath file = enumerator.Next(); !file.value().empty();
          file = enumerator.Next()) {
       result->push_back(UserScript());
       UserScript& user_script = result->back();
       // Push single js file in this UserScript.
       GURL url(std::string(chrome::kUserScriptScheme) + ":/" +
           net::FilePathToFileURL(file).ExtractFileName());
-      user_script.js_scripts().push_back(UserScript::File(file, url));
+      ExtensionResource resource(script_dir, file.BaseName());
+      user_script.js_scripts().push_back(UserScript::File(resource, url));
       UserScript::File& script_file = user_script.js_scripts().back();
       if (!LoadScriptContent(&script_file))
         result->pop_back();
       else
         ParseMetadataHeader(script_file.GetContent(), &user_script);
     }
   }
 }
 
 static void LoadLoneScripts(UserScriptList* lone_scripts) {
@@ skipping 194 matching lines @@
       DCHECK(false);
   }
 }
 
 void UserScriptMaster::StartScan() {
   if (!script_reloader_)
     script_reloader_ = new ScriptReloader(this);
 
   script_reloader_->StartScan(worker_loop_, user_script_dir_, lone_scripts_);
 }