| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/browser/importer/ie_importer.h" | 5 #include "chrome/browser/importer/ie_importer.h" |
| 6 | 6 |
| 7 #include <intshcut.h> | 7 #include <intshcut.h> |
| 8 #include <pstore.h> | 8 #include <pstore.h> |
| 9 #include <shlobj.h> | 9 #include <shlobj.h> |
| 10 #include <urlhist.h> | 10 #include <urlhist.h> |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 | 102 |
| 103 FavoritesInfo info; | 103 FavoritesInfo info; |
| 104 if (!GetFavoritesInfo(&info)) | 104 if (!GetFavoritesInfo(&info)) |
| 105 return; | 105 return; |
| 106 | 106 |
| 107 BookmarkVector bookmarks; | 107 BookmarkVector bookmarks; |
| 108 ParseFavoritesFolder(info, &bookmarks); | 108 ParseFavoritesFolder(info, &bookmarks); |
| 109 | 109 |
| 110 if (!bookmarks.empty() && !cancelled()) { | 110 if (!bookmarks.empty() && !cancelled()) { |
| 111 main_loop_->PostTask(FROM_HERE, NewRunnableMethod(writer_, | 111 main_loop_->PostTask(FROM_HERE, NewRunnableMethod(writer_, |
| 112 &ProfileWriter::AddBookmarkEntry, bookmarks, false)); | 112 &ProfileWriter::AddBookmarkEntry, bookmarks, |
| 113 l10n_util::GetString(IDS_BOOKMARK_GROUP_FROM_IE), |
| 114 first_run() ? ProfileWriter::FIRST_RUN : 0)); |
| 113 } | 115 } |
| 114 } | 116 } |
| 115 | 117 |
| 116 void IEImporter::ImportPasswordsIE6() { | 118 void IEImporter::ImportPasswordsIE6() { |
| 117 GUID AutocompleteGUID = kPStoreAutocompleteGUID; | 119 GUID AutocompleteGUID = kPStoreAutocompleteGUID; |
| 118 if (!source_path_.empty()) { | 120 if (!source_path_.empty()) { |
| 119 // We supply a fake GUID for testting. | 121 // We supply a fake GUID for testting. |
| 120 AutocompleteGUID = kUnittestGUID; | 122 AutocompleteGUID = kUnittestGUID; |
| 121 } | 123 } |
| 122 | 124 |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 if (version < 0) { | 547 if (version < 0) { |
| 546 wchar_t buffer[128]; | 548 wchar_t buffer[128]; |
| 547 DWORD buffer_length = sizeof(buffer); | 549 DWORD buffer_length = sizeof(buffer); |
| 548 bool result = ReadFromRegistry(HKEY_LOCAL_MACHINE, | 550 bool result = ReadFromRegistry(HKEY_LOCAL_MACHINE, |
| 549 L"Software\\Microsoft\\Internet Explorer", | 551 L"Software\\Microsoft\\Internet Explorer", |
| 550 L"Version", buffer, &buffer_length); | 552 L"Version", buffer, &buffer_length); |
| 551 version = (result ? _wtoi(buffer) : 0); | 553 version = (result ? _wtoi(buffer) : 0); |
| 552 } | 554 } |
| 553 return version; | 555 return version; |
| 554 } | 556 } |
| 555 | |
| OLD | NEW |