Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(811)

Side by Side Diff: chrome/browser/extensions/convert_user_script.cc

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "base/file_path.h" 11 #include "base/file_path.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/json/json_file_value_serializer.h" 13 #include "base/json/json_file_value_serializer.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/scoped_temp_dir.h" 15 #include "base/scoped_temp_dir.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/utf_string_conversions.h" 17 #include "base/utf_string_conversions.h"
18 #include "chrome/browser/extensions/user_script_master.h" 18 #include "chrome/browser/extensions/user_script_master.h"
19 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
20 #include "chrome/common/extensions/extension.h" 20 #include "chrome/common/extensions/extension.h"
21 #include "chrome/common/extensions/extension_manifest_constants.h" 21 #include "chrome/common/extensions/extension_manifest_constants.h"
22 #include "chrome/common/extensions/extension_file_util.h" 22 #include "chrome/common/extensions/extension_file_util.h"
23 #include "chrome/common/extensions/user_script.h" 23 #include "chrome/common/extensions/user_script.h"
24 #include "crypto/sha2.h" 24 #include "crypto/sha2.h"
25 #include "googleurl/src/gurl.h" 25 #include "googleurl/src/gurl.h"
26 26
27 using extensions::Extension;
28
27 namespace keys = extension_manifest_keys; 29 namespace keys = extension_manifest_keys;
28 namespace values = extension_manifest_values; 30 namespace values = extension_manifest_values;
29 31
30 scoped_refptr<Extension> ConvertUserScriptToExtension( 32 scoped_refptr<Extension> ConvertUserScriptToExtension(
31 const FilePath& user_script_path, const GURL& original_url, 33 const FilePath& user_script_path, const GURL& original_url,
32 string16* error) { 34 string16* error) {
33 std::string content; 35 std::string content;
34 if (!file_util::ReadFileToString(user_script_path, &content)) { 36 if (!file_util::ReadFileToString(user_script_path, &content)) {
35 *error = ASCIIToUTF16("Could not read source file."); 37 *error = ASCIIToUTF16("Could not read source file.");
36 return NULL; 38 return NULL;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 &utf8_error); 180 &utf8_error);
179 *error = UTF8ToUTF16(utf8_error); 181 *error = UTF8ToUTF16(utf8_error);
180 if (!extension) { 182 if (!extension) {
181 NOTREACHED() << "Could not init extension " << *error; 183 NOTREACHED() << "Could not init extension " << *error;
182 return NULL; 184 return NULL;
183 } 185 }
184 186
185 temp_dir.Take(); // The caller takes ownership of the directory. 187 temp_dir.Take(); // The caller takes ownership of the directory.
186 return extension; 188 return extension;
187 } 189 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/convert_user_script.h ('k') | chrome/browser/extensions/convert_user_script_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698