OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/sql/connection.h" | |
10 #include "app/sql/statement.h" | |
11 #include "base/file_util.h" | 9 #include "base/file_util.h" |
12 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
13 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
14 #include "base/stl_util-inl.h" | 12 #include "base/stl_util-inl.h" |
15 #include "base/string_util.h" | 13 #include "base/string_util.h" |
16 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
17 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
18 #include "chrome/browser/history/history_types.h" | 16 #include "chrome/browser/history/history_types.h" |
19 #include "chrome/browser/importer/firefox2_importer.h" | 17 #include "chrome/browser/importer/firefox2_importer.h" |
20 #include "chrome/browser/importer/firefox_importer_utils.h" | 18 #include "chrome/browser/importer/firefox_importer_utils.h" |
21 #include "chrome/browser/importer/importer_bridge.h" | 19 #include "chrome/browser/importer/importer_bridge.h" |
22 #include "chrome/browser/importer/importer_util.h" | 20 #include "chrome/browser/importer/importer_util.h" |
23 #include "chrome/browser/importer/nss_decryptor.h" | 21 #include "chrome/browser/importer/nss_decryptor.h" |
24 #include "chrome/browser/search_engines/template_url.h" | 22 #include "chrome/browser/search_engines/template_url.h" |
25 #include "chrome/common/time_format.h" | 23 #include "chrome/common/time_format.h" |
26 #include "content/browser/browser_thread.h" | 24 #include "content/browser/browser_thread.h" |
27 #include "googleurl/src/gurl.h" | 25 #include "googleurl/src/gurl.h" |
28 #include "grit/generated_resources.h" | 26 #include "grit/generated_resources.h" |
| 27 #include "sql/connection.h" |
| 28 #include "sql/statement.h" |
29 #include "webkit/glue/password_form.h" | 29 #include "webkit/glue/password_form.h" |
30 | 30 |
31 namespace { | 31 namespace { |
32 | 32 |
33 // Original definition is in http://mxr.mozilla.org/firefox/source/toolkit/ | 33 // Original definition is in http://mxr.mozilla.org/firefox/source/toolkit/ |
34 // components/places/public/nsINavBookmarksService.idl | 34 // components/places/public/nsINavBookmarksService.idl |
35 enum BookmarkItemType { | 35 enum BookmarkItemType { |
36 TYPE_BOOKMARK = 1, | 36 TYPE_BOOKMARK = 1, |
37 TYPE_FOLDER = 2, | 37 TYPE_FOLDER = 2, |
38 TYPE_SEPARATOR = 3, | 38 TYPE_SEPARATOR = 3, |
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
572 | 572 |
573 if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data)) | 573 if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data)) |
574 continue; // Unable to decode. | 574 continue; // Unable to decode. |
575 | 575 |
576 usage.urls = i->second; | 576 usage.urls = i->second; |
577 favicons->push_back(usage); | 577 favicons->push_back(usage); |
578 } | 578 } |
579 s.Reset(); | 579 s.Reset(); |
580 } | 580 } |
581 } | 581 } |
OLD | NEW |