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 "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/browser/importer/nss_decryptor.h" | 21 #include "chrome/browser/importer/nss_decryptor.h" |
22 #include "chrome/browser/search_engines/template_url.h" | 22 #include "chrome/browser/search_engines/template_url.h" |
23 #include "chrome/common/time_format.h" | 23 #include "chrome/common/time_format.h" |
24 #include "content/public/browser/browser_thread.h" | 24 #include "content/public/browser/browser_thread.h" |
25 #include "googleurl/src/gurl.h" | 25 #include "googleurl/src/gurl.h" |
26 #include "grit/generated_resources.h" | 26 #include "grit/generated_resources.h" |
27 #include "sql/connection.h" | 27 #include "sql/connection.h" |
28 #include "sql/statement.h" | 28 #include "sql/statement.h" |
29 #include "webkit/glue/password_form.h" | 29 #include "webkit/glue/password_form.h" |
30 | 30 |
| 31 using content::BrowserThread; |
| 32 |
31 namespace { | 33 namespace { |
32 | 34 |
33 // Original definition is in http://mxr.mozilla.org/firefox/source/toolkit/ | 35 // Original definition is in http://mxr.mozilla.org/firefox/source/toolkit/ |
34 // components/places/public/nsINavBookmarksService.idl | 36 // components/places/public/nsINavBookmarksService.idl |
35 enum BookmarkItemType { | 37 enum BookmarkItemType { |
36 TYPE_BOOKMARK = 1, | 38 TYPE_BOOKMARK = 1, |
37 TYPE_FOLDER = 2, | 39 TYPE_FOLDER = 2, |
38 TYPE_SEPARATOR = 3, | 40 TYPE_SEPARATOR = 3, |
39 TYPE_DYNAMIC_CONTAINER = 4 | 41 TYPE_DYNAMIC_CONTAINER = 4 |
40 }; | 42 }; |
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
572 | 574 |
573 if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data)) | 575 if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data)) |
574 continue; // Unable to decode. | 576 continue; // Unable to decode. |
575 | 577 |
576 usage.urls = i->second; | 578 usage.urls = i->second; |
577 favicons->push_back(usage); | 579 favicons->push_back(usage); |
578 } | 580 } |
579 s.Reset(); | 581 s.Reset(); |
580 } | 582 } |
581 } | 583 } |
OLD | NEW |