diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-26 12:15:06 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-26 20:41:55 +0100 |
| commit | 3dff810fe0cc4962a5fa554318e9bf8bc45f5274 (patch) | |
| tree | a9fffa9ab7d061ab00538c18beb77403547378d0 /chrome/browser/importer | |
| parent | 67d814a5d5c8d7df4740db4d2d74d0a41f94bece (diff) | |
| download | external_chromium-3dff810fe0cc4962a5fa554318e9bf8bc45f5274.zip external_chromium-3dff810fe0cc4962a5fa554318e9bf8bc45f5274.tar.gz external_chromium-3dff810fe0cc4962a5fa554318e9bf8bc45f5274.tar.bz2 | |
Merge Chromium at 12.0.742.130: Initial merge by git
Fix for bug 5080607 Update external/chromium to latest revision
Change-Id: I5c98b0d2845fccca4cbcdcea506e8f1759ba5416
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/firefox2_importer.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index f0dbcfd..9b1b4f2 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -266,9 +266,11 @@ void Firefox2Importer::ImportBookmarksFile( entry.title = folder_title; if (import_to_bookmark_bar && toolbar_folder) { // Flatten the folder in toolbar. - entry.in_toolbar = true; - entry.path.assign(path.begin() + toolbar_folder, path.end()); - toolbar_bookmarks.push_back(entry); + if (toolbar_folder <= path.size()) { + entry.in_toolbar = true; + entry.path.assign(path.begin() + toolbar_folder, path.end()); + toolbar_bookmarks.push_back(entry); + } } else { // Insert the folder into the "Imported from Firefox" folder. entry.path.assign(path.begin(), path.end()); |