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

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

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
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_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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 } 179 }
180 } 180 }
181 181
182 // Finally, create the extension object to represent the unpacked directory. 182 // Finally, create the extension object to represent the unpacked directory.
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 Extension::INTERNAL, 189 Manifest::INTERNAL,
190 *root, 190 *root,
191 extension_flags, 191 extension_flags,
192 &error); 192 &error);
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
OLDNEW
« no previous file with comments | « chrome/browser/extensions/convert_user_script.cc ('k') | chrome/browser/extensions/crx_installer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698