Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2900)

Unified Diff: chrome/browser/tab_contents/web_contents.cc

Issue 23004: Port some strings in download/save_package.cc (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/download/save_package_unittest.cc ('k') | chrome/common/temp_scaffolding_stubs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/web_contents.cc
===================================================================
--- chrome/browser/tab_contents/web_contents.cc (revision 9445)
+++ chrome/browser/tab_contents/web_contents.cc (working copy)
@@ -556,8 +556,8 @@
PrefService* prefs = profile()->GetPrefs();
DCHECK(prefs);
- std::wstring suggest_name =
- SavePackage::GetSuggestNameForSaveAs(prefs, GetTitle());
+ FilePath suggest_name = SavePackage::GetSuggestNameForSaveAs(prefs,
+ FilePath::FromWStringHack(GetTitle()));
SavePackage::SavePackageParam param(contents_mime_type());
param.prefs = prefs;
@@ -565,8 +565,11 @@
// TODO(rocking): Use new asynchronous dialog boxes to prevent the SaveAs
// dialog blocking the UI thread. See bug: http://b/issue?id=1129694.
if (SavePackage::GetSaveInfo(suggest_name, view_->GetNativeView(),
- &param, profile()->GetDownloadManager()))
- SavePage(param.saved_main_file_path, param.dir, param.save_type);
+ &param, profile()->GetDownloadManager())) {
+ SavePage(param.saved_main_file_path.ToWStringHack(),
+ param.dir.ToWStringHack(),
+ param.save_type);
+ }
}
void WebContents::SavePage(const std::wstring& main_file,
@@ -575,7 +578,9 @@
// Stop the page from navigating.
Stop();
- save_package_ = new SavePackage(this, save_type, main_file, dir_path);
+ save_package_ = new SavePackage(this, save_type,
+ FilePath::FromWStringHack(main_file),
+ FilePath::FromWStringHack(dir_path));
save_package_->Init();
}
« no previous file with comments | « chrome/browser/download/save_package_unittest.cc ('k') | chrome/common/temp_scaffolding_stubs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698