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> |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 std::string error; | 183 std::string error; |
184 int extension_flags = Extension::NO_FLAGS; | 184 int extension_flags = Extension::NO_FLAGS; |
185 if (web_app.is_bookmark_app) | 185 if (web_app.is_bookmark_app) |
186 extension_flags |= Extension::FROM_BOOKMARK; | 186 extension_flags |= Extension::FROM_BOOKMARK; |
187 scoped_refptr<Extension> extension = Extension::Create( | 187 scoped_refptr<Extension> extension = Extension::Create( |
188 temp_dir.path(), | 188 temp_dir.path(), |
189 Manifest::INTERNAL, | 189 Manifest::INTERNAL, |
190 *root, | 190 *root, |
191 extension_flags, | 191 extension_flags, |
192 &error); | 192 &error); |
193 if (!extension) { | 193 if (!extension.get()) { |
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 |