diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 04:45:54 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 04:45:54 +0000 |
| commit | f988638e6ea5a3f16e289be9ac7ffd853f7a13e4 (patch) | |
| tree | 21a390713263cede93537c0651656e83acbc5965 /chrome/installer/util/shell_util.cc | |
| parent | 39b22b7c4c5c45183a5224449f0f82d7998a70e0 (diff) | |
| download | chromium_src-f988638e6ea5a3f16e289be9ac7ffd853f7a13e4.zip chromium_src-f988638e6ea5a3f16e289be9ac7ffd853f7a13e4.tar.gz chromium_src-f988638e6ea5a3f16e289be9ac7ffd853f7a13e4.tar.bz2 | |
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
Diffstat (limited to 'chrome/installer/util/shell_util.cc')
| -rw-r--r-- | chrome/installer/util/shell_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index ced94e8..c61251b 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -767,7 +767,7 @@ bool ShellUtil::UpdateChromeShortcut(const std::wstring& chrome_exe, std::wstring chrome_path = file_util::GetDirectoryFromPath(chrome_exe); FilePath prefs_path(chrome_path); - prefs_path = prefs_path.Append(installer_util::kDefaultMasterPrefs); + prefs_path = prefs_path.AppendASCII(installer_util::kDefaultMasterPrefs); scoped_ptr<DictionaryValue> prefs( installer_util::ParseDistributionPreferences(prefs_path)); int icon_index = 0; |