Add the option of importing bookmarks from file to first run....

chrome/browser/first_run_win.cc

 // Copyright (c) 2006-2009 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/first_run.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 653 matching lines @@
   ImportProcessRunner import_runner(import_process);
 
   // Import process finished. Reload the prefs, because importer may set
   // the pref value.
   if (profile)
     profile->GetPrefs()->ReloadPersistentPrefs();
 
   return (import_runner.exit_code() == ResultCodes::NORMAL_EXIT);
 }
 
-int FirstRun::ImportNow(Profile* profile, const CommandLine& cmdline) {
+int FirstRun::ImportFromFile(Profile* profile, const CommandLine& cmdline) {
+  std::wstring file_path = cmdline.GetSwitchValue(switches::kImportFromFile);
+  if (file_path.empty()) {
+    NOTREACHED();
+    return false;
+  }
+

[cpu_(ooo_6.6-7.5), 2010/03/22 17:21:27]

remove empty line so it looks same as lines 717-718

[huanr, 2010/03/22 17:56:11]

Done.

+  scoped_refptr<ImporterHost> importer_host = new ImporterHost();
+  FirstRunImportObserver observer;
+
+  importer_host->set_headless();
+
+  ProfileInfo profile_info;
+  profile_info.browser_type = BOOKMARKS_HTML;
+  profile_info.source_path = file_path;
+
+  StartImportingWithUI(
+      NULL,
+      FAVORITES,
+      importer_host,
+      profile_info,
+      profile,
+      &observer,
+      true);
+
+  observer.RunLoop();
+  return observer.import_result();
+}
+
+int FirstRun::ImportFromBrowser(Profile* profile,
+                                const CommandLine& cmdline) {
   std::wstring import_info = cmdline.GetSwitchValue(switches::kImport);
   if (import_info.empty()) {
     NOTREACHED();
     return false;
   }
   int browser_type = 0;
   int items_to_import = 0;
   HWND parent_window = NULL;
   if (!DecodeImportParams(import_info, &browser_type, &items_to_import,
                           &parent_window)) {
@@ skipping 14 matching lines @@
       items_to_import,
       importer_host,
       importer_host->GetSourceProfileInfoForBrowserType(browser_type),
       profile,
       &observer,
       true);
   observer.RunLoop();
   return observer.import_result();
 }
 
+int FirstRun::ImportNow(Profile* profile, const CommandLine& cmdline) {
+  int return_code = true;

[cpu_(ooo_6.6-7.5), 2010/03/22 17:21:27]

return_code = false ?

[huanr, 2010/03/22 17:56:11]

I meant returning true if no import is needed.

+  if (cmdline.HasSwitch(switches::kImportFromFile)) {
+    // Silently import preset bookmarks from file.
+    // This is an OEM scenario.
+    return_code = ImportFromFile(profile, cmdline);
+  }
+  if (cmdline.HasSwitch(switches::kImport)) {
+    return_code = ImportFromBrowser(profile, cmdline);
+  }
+  return return_code;
+}
+
 //////////////////////////////////////////////////////////////////////////
 
 namespace {
 
 const wchar_t kHelpCenterUrl[] =
     L"http://www.google.com/support/chrome/bin/answer.py?answer=150752";
 
 // This class displays a modal dialog using the views system. The dialog asks
 // the user to give chrome another try. This class only handles the UI so the
 // resulting actions are up to the caller. One version looks like this:
@@ skipping 256 matching lines @@
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
   if (version > 10000) {
     // This is a test value. We want to make sure we exercise
     // returning this early. See EarlyReturnTest test harness.
     return Upgrade::TD_NOT_NOW;
   }
   TryChromeDialog td;
   return td.ShowModal();
 }