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

chrome/browser/extensions/execute_code_in_tab_function.cc

 // Copyright (c) 2009 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 "chrome/browser/browser.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
-#include "chrome/browser/net/file_reader.h"
+#include "chrome/browser/extensions/file_reader.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 
 namespace keys = extension_tabs_module_constants;
 
 const wchar_t* kCodeKey = L"code";
 const wchar_t* kFileKey = L"file";
 
 bool ExecuteCodeInTabFunction::RunImpl() {
@@ skipping 52 matching lines @@
 
   if (!code_string.empty()) {
     Execute(code_string);
     return true;
   }
 
   std::string relative_path;
   if (script_info->HasKey(kFileKey)) {
     if (!script_info->GetString(kFileKey, &relative_path))
       return false;
-    file_path_ = GetExtension()->GetResourcePath(relative_path);
+    resource_ = GetExtension()->GetResource(relative_path);
   }
-  if (file_path_.empty()) {
+  if (resource_.extension_root().empty() || resource_.relative_path().empty()) {
     error_ = keys::kNoCodeOrFileToExecuteError;
     return false;
   }
 
   scoped_refptr<FileReader> file_reader(new FileReader(
-      file_path_, NewCallback(this, &ExecuteCodeInTabFunction::DidLoadFile)));
+      resource_, NewCallback(this, &ExecuteCodeInTabFunction::DidLoadFile)));
   file_reader->Start();
   AddRef();  // Keep us alive until DidLoadFile is called.
 
   return true;
 }
 
 void ExecuteCodeInTabFunction::DidLoadFile(bool success,
                                            const std::string& data) {
   if (success) {
     Execute(data);
   } else {
 #if defined(OS_POSIX)
     error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kLoadFileError,
-        file_path_.value());
+        resource_.relative_path().value());
 #elif defined(OS_WIN)
     error_ = ExtensionErrorUtils::FormatErrorMessage(keys::kLoadFileError,
-        WideToUTF8(file_path_.value()));
+        WideToUTF8(resource_.relative_path().value()));
 #endif  // OS_WIN
     SendResponse(false);
   }
   Release();  // Balance the AddRef taken in RunImpl
 }
 
 void ExecuteCodeInTabFunction::Execute(const std::string& code_string) {
   TabContents* contents = NULL;
   Browser* browser = NULL;
   if (!ExtensionTabUtil::GetTabById(execute_tab_id_, profile(), &browser, NULL,
@@ skipping 19 matching lines @@
 void ExecuteCodeInTabFunction::Observe(NotificationType type,
                                        const NotificationSource& source,
                                        const NotificationDetails& details) {
   std::pair<int, bool>* result_details =
       Details<std::pair<int, bool> >(details).ptr();
   if (result_details->first == request_id()) {
     SendResponse(result_details->second);
     Release();  // balanced in Execute()
   }
 }