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/firefox3_importer.h" | 5 #include "chrome/browser/importer/firefox3_importer.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
12 #include "base/scoped_ptr.h" | 12 #include "base/scoped_ptr.h" |
13 #include "base/stl_util-inl.h" | 13 #include "base/stl_util-inl.h" |
14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
15 #include "chrome/browser/importer/firefox2_importer.h" | 15 #include "chrome/browser/importer/firefox2_importer.h" |
16 #include "chrome/browser/importer/firefox_importer_utils.h" | 16 #include "chrome/browser/importer/firefox_importer_utils.h" |
| 17 #include "chrome/browser/importer/nss_decryptor.h" |
17 #include "chrome/browser/search_engines/template_url.h" | 18 #include "chrome/browser/search_engines/template_url.h" |
18 #include "chrome/common/time_format.h" | 19 #include "chrome/common/time_format.h" |
19 #include "chrome/common/sqlite_utils.h" | 20 #include "chrome/common/sqlite_utils.h" |
20 #include "grit/generated_resources.h" | 21 #include "grit/generated_resources.h" |
21 #include "webkit/glue/password_form.h" | 22 #include "webkit/glue/password_form.h" |
22 | 23 |
23 using base::Time; | 24 using base::Time; |
24 using webkit_glue::PasswordForm; | 25 using webkit_glue::PasswordForm; |
25 | 26 |
26 // Wraps the function sqlite3_close() in a class that is | 27 // Wraps the function sqlite3_close() in a class that is |
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
522 | 523 |
523 if (!ReencodeFavicon(&data[0], data.size(), &usage.png_data)) | 524 if (!ReencodeFavicon(&data[0], data.size(), &usage.png_data)) |
524 continue; // Unable to decode. | 525 continue; // Unable to decode. |
525 | 526 |
526 usage.urls = i->second; | 527 usage.urls = i->second; |
527 favicons->push_back(usage); | 528 favicons->push_back(usage); |
528 } | 529 } |
529 s.reset(); | 530 s.reset(); |
530 } | 531 } |
531 } | 532 } |
OLD | NEW |