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 16 matching lines...) Expand all Loading... |
27 | 27 |
28 namespace keys = extensions::manifest_keys; | 28 namespace keys = extensions::manifest_keys; |
29 namespace values = extension_manifest_values; | 29 namespace values = extension_manifest_values; |
30 | 30 |
31 namespace extensions { | 31 namespace extensions { |
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, string16* error) { | 35 const base::FilePath& extensions_dir, string16* error) { |
36 std::string content; | 36 std::string content; |
37 if (!file_util::ReadFileToString(user_script_path, &content)) { | 37 if (!base::ReadFileToString(user_script_path, &content)) { |
38 *error = ASCIIToUTF16("Could not read source file."); | 38 *error = ASCIIToUTF16("Could not read source file."); |
39 return NULL; | 39 return NULL; |
40 } | 40 } |
41 | 41 |
42 if (!IsStringUTF8(content)) { | 42 if (!IsStringUTF8(content)) { |
43 *error = ASCIIToUTF16("User script must be UTF8 encoded."); | 43 *error = ASCIIToUTF16("User script must be UTF8 encoded."); |
44 return NULL; | 44 return NULL; |
45 } | 45 } |
46 | 46 |
47 UserScript script; | 47 UserScript script; |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 if (!extension.get()) { | 183 if (!extension.get()) { |
184 NOTREACHED() << "Could not init extension " << *error; | 184 NOTREACHED() << "Could not init extension " << *error; |
185 return NULL; | 185 return NULL; |
186 } | 186 } |
187 | 187 |
188 temp_dir.Take(); // The caller takes ownership of the directory. | 188 temp_dir.Take(); // The caller takes ownership of the directory. |
189 return extension; | 189 return extension; |
190 } | 190 } |
191 | 191 |
192 } // namespace extensions | 192 } // namespace extensions |
OLD | NEW |