| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" | 5 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 std::string* error) { | 297 std::string* error) { |
| 298 std::string content; | 298 std::string content; |
| 299 if (!base::PathExists(path) || | 299 if (!base::PathExists(path) || |
| 300 !base::ReadFileToString(path, &content)) { | 300 !base::ReadFileToString(path, &content)) { |
| 301 *error = l10n_util::GetStringFUTF8( | 301 *error = l10n_util::GetStringFUTF8( |
| 302 message_id, | 302 message_id, |
| 303 relative_path.LossyDisplayName()); | 303 relative_path.LossyDisplayName()); |
| 304 return false; | 304 return false; |
| 305 } | 305 } |
| 306 | 306 |
| 307 if (!IsStringUTF8(content)) { | 307 if (!base::IsStringUTF8(content)) { |
| 308 *error = l10n_util::GetStringFUTF8( | 308 *error = l10n_util::GetStringFUTF8( |
| 309 IDS_EXTENSION_BAD_FILE_ENCODING, | 309 IDS_EXTENSION_BAD_FILE_ENCODING, |
| 310 relative_path.LossyDisplayName()); | 310 relative_path.LossyDisplayName()); |
| 311 return false; | 311 return false; |
| 312 } | 312 } |
| 313 | 313 |
| 314 return true; | 314 return true; |
| 315 } | 315 } |
| 316 | 316 |
| 317 struct EmptyUserScriptList { | 317 struct EmptyUserScriptList { |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 459 if (!IsScriptValid(path, css_script.relative_path(), | 459 if (!IsScriptValid(path, css_script.relative_path(), |
| 460 IDS_EXTENSION_LOAD_CSS_FAILED, error)) | 460 IDS_EXTENSION_LOAD_CSS_FAILED, error)) |
| 461 return false; | 461 return false; |
| 462 } | 462 } |
| 463 } | 463 } |
| 464 | 464 |
| 465 return true; | 465 return true; |
| 466 } | 466 } |
| 467 | 467 |
| 468 } // namespace extensions | 468 } // namespace extensions |
| OLD | NEW |