summaryrefslogtreecommitdiffstats
path: root/chrome/browser/first_run.h
diff options
context:
space:
mode:
authorhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 22:01:25 +0000
committerhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 22:01:25 +0000
commit594f4ff352685bb83b71d1402264bc2cf2116e67 (patch)
tree6f1807217f5e8bc50603e5b20008e7160d49dbe7 /chrome/browser/first_run.h
parent26b0f376d66975c03c3d24afd72257f34c9bb5f6 (diff)
downloadchromium_src-594f4ff352685bb83b71d1402264bc2cf2116e67.zip
chromium_src-594f4ff352685bb83b71d1402264bc2cf2116e67.tar.gz
chromium_src-594f4ff352685bb83b71d1402264bc2cf2116e67.tar.bz2
Add import_bookmarks_from_file option to master pref that
sliently import bookmarks from file in first run. BUG=32728 TEST=unit test Review URL: http://codereview.chromium.org/1257001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run.h')
-rw-r--r--chrome/browser/first_run.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h
index 910edf56..d8a5cfd 100644
--- a/chrome/browser/first_run.h
+++ b/chrome/browser/first_run.h
@@ -106,6 +106,12 @@ class FirstRun {
// Import browser items in this process. The browser and the items to
// import are encoded int the command line.
static int ImportFromBrowser(Profile* profile, const CommandLine& cmdline);
+ // Imports settings in a separate process. It is the implementation of the
+ // public version.
+ static bool ImportSettings(Profile* profile, int browser_type,
+ int items_to_import,
+ const std::wstring& import_path,
+ gfx::NativeView parent_window);
#endif // OS_WIN
// This class is for scoping purposes.
DISALLOW_IMPLICIT_CONSTRUCTORS(FirstRun);