summaryrefslogtreecommitdiffstats
path: root/extensions/common/extension.cc
diff options
context:
space:
mode:
authortreib <treib@chromium.org>2016-02-02 07:02:14 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-02 15:03:33 +0000
commit2eab429ff3e155567d7cb224453ab07ca37a615e (patch)
tree05e7fd63a732d8fb98a1531550dd612111528eff /extensions/common/extension.cc
parent74ab6df132d6d7ac4df473c6bdf47d35ba613ddd (diff)
downloadchromium_src-2eab429ff3e155567d7cb224453ab07ca37a615e.zip
chromium_src-2eab429ff3e155567d7cb224453ab07ca37a615e.tar.gz
chromium_src-2eab429ff3e155567d7cb224453ab07ca37a615e.tar.bz2
Extension cleanup (mostly includes)
BUG=none TBRing trivial include changes TBR=derat@chromium.org TBR=benwells@chromium.org Review URL: https://codereview.chromium.org/1654043002 Cr-Commit-Position: refs/heads/master@{#372945}
Diffstat (limited to 'extensions/common/extension.cc')
-rw-r--r--extensions/common/extension.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
index 3f7e43b..227cb7e 100644
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <algorithm>
#include <utility>
#include "base/base64.h"
@@ -383,7 +384,7 @@ Extension::ManifestData* Extension::GetManifestData(const std::string& key)
void Extension::SetManifestData(const std::string& key,
Extension::ManifestData* data) {
DCHECK(!finished_parsing_manifest_ && thread_checker_.CalledOnValidThread());
- manifest_data_[key] = linked_ptr<ManifestData>(data);
+ manifest_data_[key] = scoped_ptr<ManifestData>(data);
}
Manifest::Location Extension::location() const {