From f988638e6ea5a3f16e289be9ac7ffd853f7a13e4 Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Wed, 10 Mar 2010 04:45:54 +0000 Subject: 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 --- chrome/chrome_browser.gypi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'chrome/chrome_browser.gypi') diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 48e732d..ab32af3 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2501,6 +2501,10 @@ '<@(xib_files_to_scan)'], }, ], + }, { # OS != mac + 'dependencies': [ + 'installer/installer.gyp:installer_util', + ], }], ['OS=="win"', { 'defines': [ @@ -2515,7 +2519,6 @@ '../gears/gears.gyp:gears', '../google_update/google_update.gyp:google_update', '../views/views.gyp:views', - 'installer/installer.gyp:installer_util', '<(allocator_target)', ], 'export_dependent_settings': [ -- cgit v1.1