Allow the use of the master_preferences file in Linux.

Also refactor FirstRunTabs to use GURL instead of wstring.

BUG=none
TEST=Add master_preferences file to directory containing the chrome binary and
execute chrome with the --first-run option.

Original patch by bgmerrell@gmail.com at
http://codereview.chromium.org/551160

Review URL: http://codereview.chromium.org/796001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41131 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 3 deletions

diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h
index 08a101a4..7741e77 100644
--- a/chrome/browser/first_run.h
+++ b/chrome/browser/first_run.h
@@ -11,6 +11,7 @@
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
 #include "chrome/browser/browser_process_impl.h"
+#include "googleurl/src/gurl.h"
 
 class CommandLine;
 class FilePath;
@@ -34,8 +35,8 @@ class FirstRun {
     bool homepage_defined;
     int do_import_items;
     int dont_import_items;
-    std::vector<std::wstring> new_tabs;
-    std::vector<std::wstring> bookmarks;
+    std::vector<GURL> new_tabs;
+    std::vector<GURL> bookmarks;
   };
 #if defined(OS_WIN)
   // Creates the desktop shortcut to chrome for the current user. Returns
@@ -49,6 +50,7 @@ class FirstRun {
   // FirstRun::ImportSettings(). This function might or might not show
   // a visible UI depending on the cmdline parameters.
   static int ImportNow(Profile* profile, const CommandLine& cmdline);
+#endif  // OS_WIN
 
   // The master preferences is a JSON file with the same entries as the
   // 'Default\Preferences' file. This function locates this file from
@@ -68,7 +70,6 @@ class FirstRun {
   static bool ProcessMasterPreferences(const FilePath& user_data_dir,
                                        const FilePath& master_prefs_path,
                                        MasterPrefs* out_prefs);
-#endif  // OS_WIN
 
   // Returns true if this is the first time chrome is run for this user.
   static bool IsChromeFirstRun();