diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 00:25:34 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 00:25:34 +0000 |
| commit | fd1e44cd31fc8c90d39479a5fe4bae6019a989b3 (patch) | |
| tree | c615848c4a19eabd5b30918b4c233796136ef986 /chrome_frame/chrome_frame_automation.cc | |
| parent | 7a28f1690831eeb3c33d259a7bad9e676ce41ed7 (diff) | |
| download | chromium_src-fd1e44cd31fc8c90d39479a5fe4bae6019a989b3.zip chromium_src-fd1e44cd31fc8c90d39479a5fe4bae6019a989b3.tar.gz chromium_src-fd1e44cd31fc8c90d39479a5fe4bae6019a989b3.tar.bz2 | |
Remove the Chrome Frame preprocessor define in chrome_constants.cc and deal with resulting fallout.
Also, remove several instances of Chrome Frame using wstrings instead of FilePaths.
The main goal of this patch is to move towards ensuring that Chrome Frame and Google Chrome share binary-identical exes and dlls except for setup.exe and mini_installer.exe.
Review URL: http://codereview.chromium.org/338025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index e02173d..5286f773 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -17,6 +17,7 @@ #include "chrome/app/client_util.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" +#include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome_frame/chrome_launcher.h" @@ -251,11 +252,11 @@ void ProxyFactory::CreateProxy(ProxyFactory::ProxyCacheEntry* entry, // Place the profile directory in // "<chrome_exe_path>\..\User Data\<profile-name>" if (!entry->profile_name.empty()) { - std::wstring profile_path; - if (GetUserProfileBaseDirectory(&profile_path)) { - file_util::AppendToPath(&profile_path, entry->profile_name); + FilePath profile_path; + if (chrome::GetChromeFrameUserDataDirectory(&profile_path)) { + profile_path = profile_path.Append(entry->profile_name); command_line->AppendSwitchWithValue(switches::kUserDataDir, - profile_path); + profile_path.value()); } else { // Can't get the profile dir :-( We need one to work, so fail. // We have no code for launch failure. |