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

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

Issue 3341016: Fix Firefox data import for Mac.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/importer/firefox3_importer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #ifndef CHROME_BROWSER_IMPORTER_FIREFOX3_IMPORTER_H_ 5 #ifndef CHROME_BROWSER_IMPORTER_FIREFOX3_IMPORTER_H_
6 #define CHROME_BROWSER_IMPORTER_FIREFOX3_IMPORTER_H_ 6 #define CHROME_BROWSER_IMPORTER_FIREFOX3_IMPORTER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 // Loads the favicons given in the map from the database, loads the data, 76 // Loads the favicons given in the map from the database, loads the data,
77 // and converts it into FaviconUsage structures. 77 // and converts it into FaviconUsage structures.
78 void LoadFavicons(sqlite3* db, 78 void LoadFavicons(sqlite3* db,
79 const FaviconMap& favicon_map, 79 const FaviconMap& favicon_map,
80 std::vector<history::ImportedFavIconUsage>* favicons); 80 std::vector<history::ImportedFavIconUsage>* favicons);
81 81
82 FilePath source_path_; 82 FilePath source_path_;
83 FilePath app_path_; 83 FilePath app_path_;
84 84
85 // Stored because we can only access it from the UI thread. 85 #if defined(OS_LINUX)
86 // Stored because we can only access it from the UI thread. Not usable
87 // in Mac because no access from out-of-process import.
86 std::string locale_; 88 std::string locale_;
89 #endif
87 90
88 DISALLOW_COPY_AND_ASSIGN(Firefox3Importer); 91 DISALLOW_COPY_AND_ASSIGN(Firefox3Importer);
89 }; 92 };
90 93
91 #endif // CHROME_BROWSER_IMPORTER_FIREFOX3_IMPORTER_H_ 94 #endif // CHROME_BROWSER_IMPORTER_FIREFOX3_IMPORTER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/importer/firefox3_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698