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/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/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "chrome/browser/firefox2_importer.h" | 12 #include "chrome/browser/importer/firefox2_importer.h" |
13 #include "chrome/browser/firefox_importer_utils.h" | 13 #include "chrome/browser/importer/firefox_importer_utils.h" |
14 #include "chrome/common/l10n_util.h" | 14 #include "chrome/common/l10n_util.h" |
15 #include "chrome/common/time_format.h" | 15 #include "chrome/common/time_format.h" |
16 #include "generated_resources.h" | 16 #include "generated_resources.h" |
17 | 17 |
18 // Wraps the function sqlite3_close() in a class that is | 18 // Wraps the function sqlite3_close() in a class that is |
19 // used in scoped_ptr_malloc. | 19 // used in scoped_ptr_malloc. |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 class DBClose { | 23 class DBClose { |
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
493 if (!ReencodeFavicon(&data[0], data.size(), &usage.png_data)) | 493 if (!ReencodeFavicon(&data[0], data.size(), &usage.png_data)) |
494 continue; // Unable to decode. | 494 continue; // Unable to decode. |
495 | 495 |
496 usage.urls = i->second; | 496 usage.urls = i->second; |
497 favicons->push_back(usage); | 497 favicons->push_back(usage); |
498 } | 498 } |
499 s.reset(); | 499 s.reset(); |
500 } | 500 } |
501 } | 501 } |
502 | 502 |
OLD | NEW |