Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Side by Side Diff: chrome/browser/importer/firefox3_importer.cc

Issue 7353026: Move app/sql/* files to sql/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/nss_decryptor.h" 20 #include "chrome/browser/importer/nss_decryptor.h"
23 #include "chrome/browser/search_engines/template_url.h" 21 #include "chrome/browser/search_engines/template_url.h"
24 #include "chrome/common/time_format.h" 22 #include "chrome/common/time_format.h"
25 #include "content/browser/browser_thread.h" 23 #include "content/browser/browser_thread.h"
26 #include "googleurl/src/gurl.h" 24 #include "googleurl/src/gurl.h"
27 #include "grit/generated_resources.h" 25 #include "grit/generated_resources.h"
26 #include "sql/connection.h"
27 #include "sql/statement.h"
28 #include "webkit/glue/password_form.h" 28 #include "webkit/glue/password_form.h"
29 29
30 namespace { 30 namespace {
31 31
32 // Original definition is in http://mxr.mozilla.org/firefox/source/toolkit/ 32 // Original definition is in http://mxr.mozilla.org/firefox/source/toolkit/
33 // components/places/public/nsINavBookmarksService.idl 33 // components/places/public/nsINavBookmarksService.idl
34 enum BookmarkItemType { 34 enum BookmarkItemType {
35 TYPE_BOOKMARK = 1, 35 TYPE_BOOKMARK = 1,
36 TYPE_FOLDER = 2, 36 TYPE_FOLDER = 2,
37 TYPE_SEPARATOR = 3, 37 TYPE_SEPARATOR = 3,
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 571
572 if (!ReencodeFavicon(&data[0], data.size(), &usage.png_data)) 572 if (!ReencodeFavicon(&data[0], data.size(), &usage.png_data))
573 continue; // Unable to decode. 573 continue; // Unable to decode.
574 574
575 usage.urls = i->second; 575 usage.urls = i->second;
576 favicons->push_back(usage); 576 favicons->push_back(usage);
577 } 577 }
578 s.Reset(); 578 s.Reset();
579 } 579 }
580 } 580 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698