| commit | 2a99a7e74a7f215066514fe81d2bfa6639d9eddd | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Thu Mar 28 15:31:22 2013 +0000 |
| committer | Torne (Richard Coles) <torne@google.com> | Thu Mar 28 15:31:22 2013 +0000 |
| tree | 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae | |
| parent | 61c449bbbb53310a8c041d8cefdd6b01a126cc7e [diff] [blame] |
Merge from Chromium at DEPS revision r190564 This commit was generated by merge_to_master.py. Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
diff --git a/chrome_frame/delete_chrome_history.cc b/chrome_frame/delete_chrome_history.cc index f2333f4..2749806 100644 --- a/chrome_frame/delete_chrome_history.cc +++ b/chrome_frame/delete_chrome_history.cc
@@ -43,7 +43,7 @@ } void DeleteChromeHistory::GetProfilePath(const std::wstring& profile_name, - FilePath* profile_path) { + base::FilePath* profile_path) { ChromeFramePlugin::GetProfilePath(kIexploreProfileName, profile_path); }