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

Unified Diff: chrome/common/extensions/extension.cc

Issue 10836088: Make the manifest_ member of Extension into a scoped_ptr. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/extension.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 2427b8d532de81c1c3a7716c883a0ca49abbae88..70f09f50b4559b942b689452d3f7e72dc96f60b8 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -1293,7 +1293,7 @@ bool Extension::LoadLaunchContainer(string16* error) {
launch_container_ == extension_misc::LAUNCH_WINDOW;
// Validate the container width if present.
- if (!ReadLaunchDimension(manifest_,
+ if (!ReadLaunchDimension(manifest_.get(),
keys::kLaunchWidth,
&launch_width_,
can_specify_initial_size,
@@ -1301,7 +1301,7 @@ bool Extension::LoadLaunchContainer(string16* error) {
return false;
// Validate container height if present.
- if (!ReadLaunchDimension(manifest_,
+ if (!ReadLaunchDimension(manifest_.get(),
keys::kLaunchHeight,
&launch_height_,
can_specify_initial_size,
@@ -2925,8 +2925,6 @@ Extension::Extension(const FilePath& path,
}
Extension::~Extension() {
- if (manifest_)
- delete manifest_;
}
ExtensionResource Extension::GetResource(
« no previous file with comments | « chrome/common/extensions/extension.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698