Add search engine selection dialog for Mac....

chrome/browser/browser_main.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1187 matching lines @@
 
   // Tests should be able to tune login manager before showing it.
   // Thus only show login manager in normal (non-testing) mode.
   if (!parameters.ui_task) {
     OptionallyRunChromeOSLoginManager(parsed_command_line);
   }
 
 #if !defined(OS_MACOSX)
   // Importing other browser settings is done in a browser-like process
   // that exits when this task has finished.
-  // TODO(port):  Port to Mac
+  // TODO(port): Port the Mac's IPC-based implementation to other platforms to
+  //             replace this implementation. http://crbug.com/22142
   if (parsed_command_line.HasSwitch(switches::kImport) ||
       parsed_command_line.HasSwitch(switches::kImportFromFile)) {
     return FirstRun::ImportNow(profile, parsed_command_line);
   }
 #endif
 
 #if defined(OS_WIN)
   // Do the tasks if chrome has been upgraded while it was last running.
   if (!already_running && Upgrade::DoUpgradeTasks(parsed_command_line))
     return ResultCodes::NORMAL_EXIT;
@@ skipping 24 matching lines @@
   }
 #endif
 
   // Show the First Run UI if this is the first time Chrome has been run on
   // this computer, or we're being compelled to do so by a command line flag.
   // Note that this be done _after_ the PrefService is initialized and all
   // preferences are registered, since some of the code that the importer
   // touches reads preferences.
   if (is_first_run) {
     if (!first_run_ui_bypass) {
-#if defined(OS_WIN) || defined(OS_LINUX)
       FirstRun::AutoImport(profile,
                            master_prefs.homepage_defined,
                            master_prefs.do_import_items,
                            master_prefs.dont_import_items,
                            master_prefs.run_search_engine_experiment,
                            master_prefs.randomize_search_engine_experiment,
                            master_prefs.make_chrome_default,
                            &process_singleton);
-#else
-      if (!OpenFirstRunDialog(profile,
-                              master_prefs.homepage_defined,
-                              master_prefs.do_import_items,
-                              master_prefs.dont_import_items,
-                              master_prefs.run_search_engine_experiment,
-                              master_prefs.randomize_search_engine_experiment,
-                              &process_singleton)) {
-        return ResultCodes::NORMAL_EXIT;
-      }
-#endif
 #if defined(OS_POSIX)
       // On Windows, the download is tagged with enable/disable stats so there
       // is no need for this code.
 
       // If stats reporting was turned on by the first run dialog then toggle
       // the pref.
       if (GoogleUpdateSettings::GetCollectStatsConsent())
         local_state->SetBoolean(prefs::kMetricsReportingEnabled, true);
 #endif  // OS_POSIX
     }  // if (!first_run_ui_bypass)
@@ skipping 224 matching lines @@
   metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   ignore_result(browser_process.release());
   browser_shutdown::Shutdown();
 
   TRACE_EVENT_END("BrowserMain", 0, 0);
   return result_code;
 }