Index: components/bookmarks/browser/bookmark_codec.cc |
diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc |
index abbb1cd7b64289eceba9eff25a87872d786d9304..8ee8a6170d2312a6797605b0d378f500869be173 100644 |
--- a/components/bookmarks/browser/bookmark_codec.cc |
+++ b/components/bookmarks/browser/bookmark_codec.cc |
@@ -13,6 +13,7 @@ |
#include "base/memory/ptr_util.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_util.h" |
+#include "base/sys_info.h" |
sky
2017/05/26 03:07:38
You shouldn't need this key anymore.
ssid
2017/05/30 21:39:14
Done.
|
#include "base/values.h" |
#include "components/bookmarks/browser/bookmark_model.h" |
#include "components/strings/grit/components_strings.h" |
@@ -433,6 +434,14 @@ void BookmarkCodec::DecodeMetaInfoHelper( |
const std::string& prefix, |
BookmarkNode::MetaInfoMap* meta_info_map) { |
for (base::DictionaryValue::Iterator it(dict); !it.IsAtEnd(); it.Advance()) { |
+ bool is_excluded = false; |
+ for (const auto& excluded : excluded_meta_info_keys_) { |
+ if (it.key().find(excluded) != std::string::npos) |
+ is_excluded = true; |
+ } |
+ if (is_excluded) |
+ continue; |
+ |
if (it.value().IsType(base::Value::Type::DICTIONARY)) { |
const base::DictionaryValue* subdict; |
it.value().GetAsDictionary(&subdict); |