diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 04:31:22 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 04:31:22 +0000 |
| commit | 4f09393e0d9f357a271353b727246864378fdf17 (patch) | |
| tree | c3b561d3384c9287cb11f545fa6adcae9b8d5a55 /chrome/browser/browser_init.cc | |
| parent | e0291ec704fd21a4e99e99c60766c768f58ebcb3 (diff) | |
| download | chromium_src-4f09393e0d9f357a271353b727246864378fdf17.zip chromium_src-4f09393e0d9f357a271353b727246864378fdf17.tar.gz chromium_src-4f09393e0d9f357a271353b727246864378fdf17.tar.bz2 | |
Deprecate wstring version of PathService::Get() in webkit.
Review URL: http://codereview.chromium.org/99266
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 0bfc99e..88eae8b 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -7,6 +7,7 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/event_recorder.h" +#include "base/file_path.h" #include "base/histogram.h" #include "base/path_service.h" #include "base/string_util.h" @@ -97,10 +98,10 @@ void SetOverrideHomePage(const CommandLine& command_line, PrefService* prefs) { // If homepage is specified on the command line, canonify & store it. if (command_line.HasSwitch(switches::kHomePage)) { - std::wstring browser_directory; + FilePath browser_directory; PathService::Get(base::DIR_CURRENT, &browser_directory); std::wstring new_homepage = URLFixerUpper::FixupRelativeFile( - browser_directory, + browser_directory.ToWStringHack(), command_line.GetSwitchValue(switches::kHomePage)); prefs->transient()->SetString(prefs::kHomePage, new_homepage); prefs->transient()->SetBoolean(prefs::kHomePageIsNewTabPage, false); @@ -250,7 +251,7 @@ bool BrowserInit::LaunchWithProfile::Launch(Profile* profile, // If we're recording or playing back, startup the EventRecorder now // unless otherwise specified. if (!command_line_.HasSwitch(switches::kNoEvents)) { - std::wstring script_path; + FilePath script_path; PathService::Get(chrome::FILE_RECORDED_SCRIPT, &script_path); bool record_mode = command_line_.HasSwitch(switches::kRecordMode); |