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

Unified Diff: chrome/browser/importer/importer_list.h

Issue 24345002: Do not add "Bookmarks File" to ImporterList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/first_run/first_run_browsertest.cc ('k') | chrome/browser/importer/importer_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/importer_list.h
diff --git a/chrome/browser/importer/importer_list.h b/chrome/browser/importer/importer_list.h
index 9a18a82bfa04507555709d76d417e2f3af40a6ef..74c45d35e0977aa4273c72ad731fd06c12544f12 100644
--- a/chrome/browser/importer/importer_list.h
+++ b/chrome/browser/importer/importer_list.h
@@ -29,6 +29,7 @@ class ImporterList : public base::RefCountedThreadSafe<ImporterList> {
// the real work of detecting source profiles. |observer| must be non-NULL.
// |locale|: As in DetectSourceProfilesWorker().
void DetectSourceProfiles(const std::string& locale,
+ bool include_interactive_profiles,
importer::ImporterListObserver* observer);
// Sets the observer of this object. When the current observer is destroyed,
@@ -41,7 +42,8 @@ class ImporterList : public base::RefCountedThreadSafe<ImporterList> {
// DEPRECATED: This method is synchronous and performs file operations which
// may end up blocking the current thread, which is usually the UI thread.
// |locale|: As in DetectSourceProfilesWorker().
- void DetectSourceProfilesHack(const std::string& locale);
+ void DetectSourceProfilesHack(const std::string& locale,
+ bool include_interactive_profiles);
// Returns the number of different source profiles you can import from.
size_t count() const { return source_profiles_.size(); }
@@ -67,7 +69,8 @@ class ImporterList : public base::RefCountedThreadSafe<ImporterList> {
// thread. |locale|:The application locale (it must be taken as an argument
// since this code runs on the FILE thread where GetApplicationLocale() isn't
// available).
- void DetectSourceProfilesWorker(const std::string& locale);
+ void DetectSourceProfilesWorker(const std::string& locale,
+ bool include_interactive_profiles);
// Called by DetectSourceProfilesWorker() on the source thread. This method
// notifies |observer_| that the source profiles are loaded. |profiles| is
« no previous file with comments | « chrome/browser/first_run/first_run_browsertest.cc ('k') | chrome/browser/importer/importer_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698