| Index: chrome/browser/first_run_gtk.cc
|
| diff --git a/chrome/browser/first_run_gtk.cc b/chrome/browser/first_run_gtk.cc
|
| index 2c5d144025456d82f8e9fed178eb697a357a76dd..3d4a0916fb695fd3c007283ed31a3d3894dd50cd 100644
|
| --- a/chrome/browser/first_run_gtk.cc
|
| +++ b/chrome/browser/first_run_gtk.cc
|
| @@ -10,24 +10,5 @@ bool OpenFirstRunDialog(Profile* profile, bool homepage_defined,
|
| int import_items,
|
| int dont_import_items,
|
| ProcessSingleton* process_singleton) {
|
| - // TODO(port): Use process_singleton to make sure Chrome can not be started
|
| - // while this process is active.
|
| return FirstRunDialog::Show(profile, process_singleton);
|
| }
|
| -
|
| -bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
|
| - const FilePath& master_prefs_path,
|
| - std::vector<std::wstring>* new_tabs,
|
| - int* ping_delay,
|
| - bool* homepage_defined,
|
| - int* do_import_items,
|
| - int* dont_import_items) {
|
| - // http://code.google.com/p/chromium/issues/detail?id=11971
|
| - return true;
|
| -}
|
| -
|
| -// static
|
| -int FirstRun::ImportNow(Profile* profile, const CommandLine& cmdline) {
|
| - // http://code.google.com/p/chromium/issues/detail?id=11971
|
| - return 0;
|
| -}
|
|
|