Chromium Code Reviews| 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 "chrome/utility/importer/ie_importer_win.h" | 5 #include "chrome/utility/importer/ie_importer_win.h" |
| 6 | 6 |
| 7 #include <ole2.h> | 7 #include <ole2.h> |
| 8 #include <intshcut.h> | 8 #include <intshcut.h> |
| 9 #include <shlobj.h> | 9 #include <shlobj.h> |
| 10 #include <stddef.h> | 10 #include <stddef.h> |
| (...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 553 } else { | 553 } else { |
| 554 // dwFlags should only contain the STATURLFLAG_ISTOPLEVEL bit per | 554 // dwFlags should only contain the STATURLFLAG_ISTOPLEVEL bit per |
| 555 // the filter set above. | 555 // the filter set above. |
| 556 DCHECK(!stat_url.dwFlags); | 556 DCHECK(!stat_url.dwFlags); |
| 557 row.hidden = true; | 557 row.hidden = true; |
| 558 } | 558 } |
| 559 | 559 |
| 560 rows.push_back(row); | 560 rows.push_back(row); |
| 561 } | 561 } |
| 562 | 562 |
| 563 if (!rows.empty() && !cancelled()) { | 563 if (!cancelled()) { |
|
sky
2016/08/30 20:34:37
no {}
| |
| 564 bridge_->SetHistoryItems(rows, importer::VISIT_SOURCE_IE_IMPORTED); | 564 bridge_->SetHistoryItems(rows, importer::VISIT_SOURCE_IE_IMPORTED); |
| 565 } | 565 } |
| 566 } | 566 } |
| 567 } | 567 } |
| 568 | 568 |
| 569 void IEImporter::ImportPasswordsIE6() { | 569 void IEImporter::ImportPasswordsIE6() { |
| 570 GUID AutocompleteGUID = kPStoreAutocompleteGUID; | 570 GUID AutocompleteGUID = kPStoreAutocompleteGUID; |
| 571 if (!source_path_.empty()) { | 571 if (!source_path_.empty()) { |
| 572 // We supply a fake GUID for testting. | 572 // We supply a fake GUID for testting. |
| 573 AutocompleteGUID = kUnittestGUID; | 573 AutocompleteGUID = kUnittestGUID; |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 911 static int version = -1; | 911 static int version = -1; |
| 912 if (version < 0) { | 912 if (version < 0) { |
| 913 wchar_t buffer[128]; | 913 wchar_t buffer[128]; |
| 914 DWORD buffer_length = sizeof(buffer); | 914 DWORD buffer_length = sizeof(buffer); |
| 915 base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ); | 915 base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ); |
| 916 LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL); | 916 LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL); |
| 917 version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0); | 917 version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0); |
| 918 } | 918 } |
| 919 return version; | 919 return version; |
| 920 } | 920 } |
| OLD | NEW |