| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <Cocoa/Cocoa.h> | 5 #include <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #include "chrome/utility/importer/safari_importer.h" | 7 #include "chrome/utility/importer/safari_importer.h" |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 // Recursively read in bookmarks. | 287 // Recursively read in bookmarks. |
| 288 std::vector<base::string16> parent_path_elements; | 288 std::vector<base::string16> parent_path_elements; |
| 289 RecursiveReadBookmarksFolder(bookmarks_dict, parent_path_elements, false, | 289 RecursiveReadBookmarksFolder(bookmarks_dict, parent_path_elements, false, |
| 290 toolbar_name, bookmarks); | 290 toolbar_name, bookmarks); |
| 291 } | 291 } |
| 292 | 292 |
| 293 void SafariImporter::ImportPasswords() { | 293 void SafariImporter::ImportPasswords() { |
| 294 // Safari stores it's passwords in the Keychain, same as us so we don't need | 294 // Safari stores it's passwords in the Keychain, same as us so we don't need |
| 295 // to import them. | 295 // to import them. |
| 296 // Note: that we don't automatically pick them up, there is some logic around | 296 // Note: that we don't automatically pick them up, there is some logic around |
| 297 // the user needing to explicitly input his username in a page and blurring | 297 // the user needing to explicitly input their username in a page and blurring |
| 298 // the field before we pick it up, but the details of that are beyond the | 298 // the field before we pick it up, but the details of that are beyond the |
| 299 // scope of this comment. | 299 // scope of this comment. |
| 300 } | 300 } |
| 301 | 301 |
| 302 void SafariImporter::ImportHistory() { | 302 void SafariImporter::ImportHistory() { |
| 303 std::vector<ImporterURLRow> rows; | 303 std::vector<ImporterURLRow> rows; |
| 304 ParseHistoryItems(&rows); | 304 ParseHistoryItems(&rows); |
| 305 | 305 |
| 306 if (!rows.empty() && !cancelled()) { | 306 if (!rows.empty() && !cancelled()) { |
| 307 bridge_->SetHistoryItems(rows, importer::VISIT_SOURCE_SAFARI_IMPORTED); | 307 bridge_->SetHistoryItems(rows, importer::VISIT_SOURCE_SAFARI_IMPORTED); |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 if (!last_visit_str) | 372 if (!last_visit_str) |
| 373 continue; | 373 continue; |
| 374 | 374 |
| 375 // Convert Safari's last visit time to Unix Epoch time. | 375 // Convert Safari's last visit time to Unix Epoch time. |
| 376 double seconds_since_unix_epoch = HistoryTimeToEpochTime(last_visit_str); | 376 double seconds_since_unix_epoch = HistoryTimeToEpochTime(last_visit_str); |
| 377 row.last_visit = base::Time::FromDoubleT(seconds_since_unix_epoch); | 377 row.last_visit = base::Time::FromDoubleT(seconds_since_unix_epoch); |
| 378 | 378 |
| 379 history_items->push_back(row); | 379 history_items->push_back(row); |
| 380 } | 380 } |
| 381 } | 381 } |
| OLD | NEW |