OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/logging.h" | 15 #include "base/logging.h" |
16 #include "base/path_service.h" | 16 #include "base/path_service.h" |
17 #include "base/scoped_temp_dir.h" | 17 #include "base/scoped_temp_dir.h" |
18 #include "base/sha2.h" | 18 #include "base/sha2.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_constants.h" | 24 #include "chrome/common/extensions/extension_constants.h" |
| 25 #include "chrome/common/extensions/extension_file_util.h" |
25 #include "chrome/common/json_value_serializer.h" | 26 #include "chrome/common/json_value_serializer.h" |
26 #include "chrome/common/web_apps.h" | 27 #include "chrome/common/web_apps.h" |
27 #include "gfx/codec/png_codec.h" | 28 #include "gfx/codec/png_codec.h" |
28 #include "googleurl/src/gurl.h" | 29 #include "googleurl/src/gurl.h" |
29 #include "third_party/skia/include/core/SkBitmap.h" | 30 #include "third_party/skia/include/core/SkBitmap.h" |
30 | 31 |
31 namespace keys = extension_manifest_keys; | 32 namespace keys = extension_manifest_keys; |
32 | 33 |
33 using base::Time; | 34 using base::Time; |
34 | 35 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 return base::StringPrintf("%i.%i.%i.%i", | 78 return base::StringPrintf("%i.%i.%i.%i", |
78 create_time_exploded.year, | 79 create_time_exploded.year, |
79 create_time_exploded.month, | 80 create_time_exploded.month, |
80 create_time_exploded.day_of_month, | 81 create_time_exploded.day_of_month, |
81 static_cast<uint16>(stamp)); | 82 static_cast<uint16>(stamp)); |
82 } | 83 } |
83 | 84 |
84 scoped_refptr<Extension> ConvertWebAppToExtension( | 85 scoped_refptr<Extension> ConvertWebAppToExtension( |
85 const WebApplicationInfo& web_app, | 86 const WebApplicationInfo& web_app, |
86 const Time& create_time) { | 87 const Time& create_time) { |
87 FilePath user_data_temp_dir; | 88 FilePath user_data_temp_dir = extension_file_util::GetUserDataTempDir(); |
88 CHECK(PathService::Get(chrome::DIR_USER_DATA_TEMP, &user_data_temp_dir)); | 89 if (user_data_temp_dir.empty()) { |
| 90 LOG(ERROR) << "Could not get path to profile temporary directory."; |
| 91 return NULL; |
| 92 } |
89 | 93 |
90 ScopedTempDir temp_dir; | 94 ScopedTempDir temp_dir; |
91 if (!temp_dir.CreateUniqueTempDirUnderPath(user_data_temp_dir)) { | 95 if (!temp_dir.CreateUniqueTempDirUnderPath(user_data_temp_dir)) { |
92 LOG(ERROR) << "Could not create temporary directory."; | 96 LOG(ERROR) << "Could not create temporary directory."; |
93 return NULL; | 97 return NULL; |
94 } | 98 } |
95 | 99 |
96 // Create the manifest | 100 // Create the manifest |
97 scoped_ptr<DictionaryValue> root(new DictionaryValue); | 101 scoped_ptr<DictionaryValue> root(new DictionaryValue); |
98 root->SetString(keys::kPublicKey, GenerateKey(web_app.manifest_url)); | 102 root->SetString(keys::kPublicKey, GenerateKey(web_app.manifest_url)); |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 scoped_refptr<Extension> extension = Extension::Create( | 170 scoped_refptr<Extension> extension = Extension::Create( |
167 temp_dir.path(), Extension::INTERNAL, *root, false, &error); | 171 temp_dir.path(), Extension::INTERNAL, *root, false, &error); |
168 if (!extension) { | 172 if (!extension) { |
169 LOG(ERROR) << error; | 173 LOG(ERROR) << error; |
170 return NULL; | 174 return NULL; |
171 } | 175 } |
172 | 176 |
173 temp_dir.Take(); // The caller takes ownership of the directory. | 177 temp_dir.Take(); // The caller takes ownership of the directory. |
174 return extension; | 178 return extension; |
175 } | 179 } |
OLD | NEW |