summaryrefslogtreecommitdiffstats
path: root/chrome/browser/first_run
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 13:45:38 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 13:45:38 +0000
commitf146bd4bd2826d47c6673d2432a0184abfbd8977 (patch)
tree36691119ce420c6de03c234da6af51c203be8141 /chrome/browser/first_run
parent8790770a10a0c67f15a7e1d49a3fcbb3ef4d7f3f (diff)
downloadchromium_src-f146bd4bd2826d47c6673d2432a0184abfbd8977.zip
chromium_src-f146bd4bd2826d47c6673d2432a0184abfbd8977.tar.gz
chromium_src-f146bd4bd2826d47c6673d2432a0184abfbd8977.tar.bz2
Easy cleanup in first-run.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3290020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
-rw-r--r--chrome/browser/first_run/first_run.h3
-rw-r--r--chrome/browser/first_run/first_run_gtk.cc13
2 files changed, 2 insertions, 14 deletions
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index 51fdb878..87b2524 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -306,7 +306,7 @@ class FirstRunImportObserver : public ImportObserver {
DISALLOW_COPY_AND_ASSIGN(FirstRunImportObserver);
};
-
+#if defined(OS_MACOSX)
// Show the First Run UI to the user, allowing them to create shortcuts for
// the app, import their bookmarks and other data from another browser into
// |profile| and perhaps some other tasks.
@@ -331,5 +331,6 @@ bool OpenFirstRunDialog(Profile* profile,
bool search_engine_experiment,
bool randomize_search_engine_experiment,
ProcessSingleton* process_singleton);
+#endif // OS_MACOSX
#endif // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
diff --git a/chrome/browser/first_run/first_run_gtk.cc b/chrome/browser/first_run/first_run_gtk.cc
index 3c5e792..06febbd 100644
--- a/chrome/browser/first_run/first_run_gtk.cc
+++ b/chrome/browser/first_run/first_run_gtk.cc
@@ -60,21 +60,8 @@ class ImportEndedObserver : public ImporterHost::Observer {
} // namespace
-// TODO(estade): pay attention to the args between |profile| and
-// |process_singleton|.
-bool OpenFirstRunDialog(Profile* profile,
- bool homepage_defined,
- int import_items,
- int dont_import_items,
- bool search_engine_experiment,
- bool randomize_search_engine_experiment,
- ProcessSingleton* process_singleton) {
- return FirstRunDialog::Show(profile, process_singleton);
-}
-
// TODO(port): This is just a piece of the silent import functionality from
// ImportSettings for Windows. It would be nice to get the rest of it ported.
-// TODO(estade): When do we use this?
bool FirstRun::ImportBookmarks(const FilePath& import_bookmarks_path) {
const CommandLine& cmdline = *CommandLine::ForCurrentProcess();
CommandLine import_cmd(cmdline.GetProgram());