diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 20:00:13 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 20:00:13 +0000 |
| commit | ef5ff1b40f1024d834620f5cede62dfd4aea6e0c (patch) | |
| tree | 3935dae6b7f1ab45c01bc8f66d6bfee7338d9a9a /chrome/browser/rlz | |
| parent | 0bbb1b1f9842366babce756ab2f1713832be63de (diff) | |
| download | chromium_src-ef5ff1b40f1024d834620f5cede62dfd4aea6e0c.zip chromium_src-ef5ff1b40f1024d834620f5cede62dfd4aea6e0c.tar.gz chromium_src-ef5ff1b40f1024d834620f5cede62dfd4aea6e0c.tar.bz2 | |
Fix to use FilePath version of PathService::Get.
BUG=None
TEST=None
Original Review URL: http://codereview.chromium.org/174189
Patch from Thiago Farina <thiago.farina@gmail.com>.
Review URL: http://codereview.chromium.org/193047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/rlz')
| -rw-r--r-- | chrome/browser/rlz/rlz.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc index a280be2..620dd2c 100644 --- a/chrome/browser/rlz/rlz.cc +++ b/chrome/browser/rlz/rlz.cc @@ -80,11 +80,11 @@ FuncT WireExport(HMODULE module, const char* export_name) { } HMODULE LoadRLZLibraryInternal(int directory_key) { - std::wstring rlz_path; + FilePath rlz_path; if (!PathService::Get(directory_key, &rlz_path)) return NULL; - file_util::AppendToPath(&rlz_path, L"rlz.dll"); - return ::LoadLibraryW(rlz_path.c_str()); + rlz_path = rlz_path.AppendASCII("rlz.dll"); + return ::LoadLibraryW(rlz_path.value().c_str()); } bool LoadRLZLibrary(int directory_key) { @@ -261,12 +261,11 @@ class DelayedInitTask : public Task { bool IsGoogleDefaultSearch() { if (!g_browser_process) return false; - std::wstring user_data_dir; + FilePath user_data_dir; if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) return false; ProfileManager* profile_manager = g_browser_process->profile_manager(); - Profile* profile = profile_manager-> - GetDefaultProfile(FilePath::FromWStringHack(user_data_dir)); + Profile* profile = profile_manager->GetDefaultProfile(user_data_dir); if (!profile) return false; const TemplateURL* url_template = |