diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 23:42:01 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 23:42:01 +0000 |
| commit | 78a162f7f9a50666fd246457467383dd54ede5c2 (patch) | |
| tree | 13443655795adbf0e5c3d3d3d2e8c49a4b9de98b /chrome/browser/importer | |
| parent | 7aaa8425b4700dd7427e1e146b090ff694fea0fc (diff) | |
| download | chromium_src-78a162f7f9a50666fd246457467383dd54ede5c2.zip chromium_src-78a162f7f9a50666fd246457467383dd54ede5c2.tar.gz chromium_src-78a162f7f9a50666fd246457467383dd54ede5c2.tar.bz2 | |
Fix early return/DCHECK importing Safari bookmarks.
BUG=19167
Review URL: http://codereview.chromium.org/164442
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/safari_importer.mm | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm index 0057aef..1f839a7 100644 --- a/chrome/browser/importer/safari_importer.mm +++ b/chrome/browser/importer/safari_importer.mm @@ -179,12 +179,15 @@ void SafariImporter::RecursiveReadBookmarksFolder( objectForKey:@"WebBookmarkFileVersion"] != nil; // We're expecting a list of bookmarks here, if that isn't what we got, fail. - if (![type isEqualToString:@"WebBookmarkTypeList"] || !title) { - DCHECK(false) << "Type =(" - << (type ? base::SysNSStringToUTF8(type) : "Null Type") - << ") Title=(" << (title ? base::SysNSStringToUTF8(title) : "Null title") - << ")"; - return; + if (!is_top_level_bookmarks_container) { + // Top level containers sometimes don't have title attributes. + if (![type isEqualToString:@"WebBookmarkTypeList"] || !title) { + DCHECK(false) << "Type =(" + << (type ? base::SysNSStringToUTF8(type) : "Null Type") + << ") Title=(" << (title ? base::SysNSStringToUTF8(title) : "Null title") + << ")"; + return; + } } std::vector<std::wstring> path_elements(parent_path_elements); |