| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/extensions/convert_user_script.h" | 5 #include "chrome/browser/extensions/convert_user_script.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 scoped_refptr<Extension> ConvertUserScriptToExtension( | 33 scoped_refptr<Extension> ConvertUserScriptToExtension( |
| 34 const base::FilePath& user_script_path, const GURL& original_url, | 34 const base::FilePath& user_script_path, const GURL& original_url, |
| 35 const base::FilePath& extensions_dir, base::string16* error) { | 35 const base::FilePath& extensions_dir, base::string16* error) { |
| 36 std::string content; | 36 std::string content; |
| 37 if (!base::ReadFileToString(user_script_path, &content)) { | 37 if (!base::ReadFileToString(user_script_path, &content)) { |
| 38 *error = base::ASCIIToUTF16("Could not read source file."); | 38 *error = base::ASCIIToUTF16("Could not read source file."); |
| 39 return NULL; | 39 return NULL; |
| 40 } | 40 } |
| 41 | 41 |
| 42 if (!IsStringUTF8(content)) { | 42 if (!base::IsStringUTF8(content)) { |
| 43 *error = base::ASCIIToUTF16("User script must be UTF8 encoded."); | 43 *error = base::ASCIIToUTF16("User script must be UTF8 encoded."); |
| 44 return NULL; | 44 return NULL; |
| 45 } | 45 } |
| 46 | 46 |
| 47 UserScript script; | 47 UserScript script; |
| 48 if (!UserScriptMaster::ScriptReloader::ParseMetadataHeader(content, | 48 if (!UserScriptMaster::ScriptReloader::ParseMetadataHeader(content, |
| 49 &script)) { | 49 &script)) { |
| 50 *error = base::ASCIIToUTF16("Invalid script header."); | 50 *error = base::ASCIIToUTF16("Invalid script header."); |
| 51 return NULL; | 51 return NULL; |
| 52 } | 52 } |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 if (!extension.get()) { | 184 if (!extension.get()) { |
| 185 NOTREACHED() << "Could not init extension " << *error; | 185 NOTREACHED() << "Could not init extension " << *error; |
| 186 return NULL; | 186 return NULL; |
| 187 } | 187 } |
| 188 | 188 |
| 189 temp_dir.Take(); // The caller takes ownership of the directory. | 189 temp_dir.Take(); // The caller takes ownership of the directory. |
| 190 return extension; | 190 return extension; |
| 191 } | 191 } |
| 192 | 192 |
| 193 } // namespace extensions | 193 } // namespace extensions |
| OLD | NEW |