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_web_app.h" | 5 #include "chrome/browser/extensions/convert_web_app.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 #include <limits> | 8 #include <limits> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/base64.h" | 12 #include "base/base64.h" |
13 #include "base/file_path.h" | 13 #include "base/file_path.h" |
14 #include "base/file_util.h" | 14 #include "base/file_util.h" |
| 15 #include "base/files/scoped_temp_dir.h" |
15 #include "base/json/json_file_value_serializer.h" | 16 #include "base/json/json_file_value_serializer.h" |
16 #include "base/logging.h" | 17 #include "base/logging.h" |
17 #include "base/path_service.h" | 18 #include "base/path_service.h" |
18 #include "base/scoped_temp_dir.h" | |
19 #include "base/stringprintf.h" | 19 #include "base/stringprintf.h" |
20 #include "base/time.h" | 20 #include "base/time.h" |
21 #include "base/utf_string_conversions.h" | 21 #include "base/utf_string_conversions.h" |
22 #include "chrome/common/chrome_paths.h" | 22 #include "chrome/common/chrome_paths.h" |
23 #include "chrome/common/extensions/extension.h" | 23 #include "chrome/common/extensions/extension.h" |
| 24 #include "chrome/common/extensions/extension_file_util.h" |
24 #include "chrome/common/extensions/extension_manifest_constants.h" | 25 #include "chrome/common/extensions/extension_manifest_constants.h" |
25 #include "chrome/common/extensions/extension_file_util.h" | |
26 #include "chrome/common/web_apps.h" | 26 #include "chrome/common/web_apps.h" |
27 #include "crypto/sha2.h" | 27 #include "crypto/sha2.h" |
28 #include "googleurl/src/gurl.h" | 28 #include "googleurl/src/gurl.h" |
29 #include "third_party/skia/include/core/SkBitmap.h" | 29 #include "third_party/skia/include/core/SkBitmap.h" |
30 #include "ui/gfx/codec/png_codec.h" | 30 #include "ui/gfx/codec/png_codec.h" |
31 | 31 |
32 namespace extensions { | 32 namespace extensions { |
33 | 33 |
34 namespace keys = extension_manifest_keys; | 34 namespace keys = extension_manifest_keys; |
35 | 35 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 const WebApplicationInfo& web_app, | 87 const WebApplicationInfo& web_app, |
88 const Time& create_time, | 88 const Time& create_time, |
89 const FilePath& extensions_dir) { | 89 const FilePath& extensions_dir) { |
90 FilePath install_temp_dir = | 90 FilePath install_temp_dir = |
91 extension_file_util::GetInstallTempDir(extensions_dir); | 91 extension_file_util::GetInstallTempDir(extensions_dir); |
92 if (install_temp_dir.empty()) { | 92 if (install_temp_dir.empty()) { |
93 LOG(ERROR) << "Could not get path to profile temporary directory."; | 93 LOG(ERROR) << "Could not get path to profile temporary directory."; |
94 return NULL; | 94 return NULL; |
95 } | 95 } |
96 | 96 |
97 ScopedTempDir temp_dir; | 97 base::ScopedTempDir temp_dir; |
98 if (!temp_dir.CreateUniqueTempDirUnderPath(install_temp_dir)) { | 98 if (!temp_dir.CreateUniqueTempDirUnderPath(install_temp_dir)) { |
99 LOG(ERROR) << "Could not create temporary directory."; | 99 LOG(ERROR) << "Could not create temporary directory."; |
100 return NULL; | 100 return NULL; |
101 } | 101 } |
102 | 102 |
103 // Create the manifest | 103 // Create the manifest |
104 scoped_ptr<DictionaryValue> root(new DictionaryValue); | 104 scoped_ptr<DictionaryValue> root(new DictionaryValue); |
105 if (!web_app.is_bookmark_app) | 105 if (!web_app.is_bookmark_app) |
106 root->SetString(keys::kPublicKey, GenerateKey(web_app.manifest_url)); | 106 root->SetString(keys::kPublicKey, GenerateKey(web_app.manifest_url)); |
107 else | 107 else |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 if (!extension) { | 193 if (!extension) { |
194 LOG(ERROR) << error; | 194 LOG(ERROR) << error; |
195 return NULL; | 195 return NULL; |
196 } | 196 } |
197 | 197 |
198 temp_dir.Take(); // The caller takes ownership of the directory. | 198 temp_dir.Take(); // The caller takes ownership of the directory. |
199 return extension; | 199 return extension; |
200 } | 200 } |
201 | 201 |
202 } // namespace extensions | 202 } // namespace extensions |
OLD | NEW |