diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 20:46:33 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 20:46:33 +0000 |
| commit | 1f733cf713cdb0a05f24657a278d49c3a4b88a30 (patch) | |
| tree | 2a966ac70350e26df001b64dfd4811ccce41ceed /chrome/browser | |
| parent | 57a336aa8b9a591e42fadcae359b20d596af7526 (diff) | |
| download | chromium_src-1f733cf713cdb0a05f24657a278d49c3a4b88a30.zip chromium_src-1f733cf713cdb0a05f24657a278d49c3a4b88a30.tar.gz chromium_src-1f733cf713cdb0a05f24657a278d49c3a4b88a30.tar.bz2 | |
Landing patch from contributor Thiago Farina.
Update GetDownloadDirectory to take FilePath instead of wstring to avoid conversions "To and From wstring".
BUG=None
TEST=run ui_tests.exe
Review URL: http://codereview.chromium.org/243047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/automation/automation_provider.h | 3 | ||||
| -rw-r--r-- | chrome/browser/download/download_uitest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/download/save_page_uitest.cc | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index f93d39c..0f77ad3 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1246,13 +1246,13 @@ void AutomationProvider::SetProxyConfig(const std::string& new_proxy_config) { } void AutomationProvider::GetDownloadDirectory( - int handle, std::wstring* download_directory) { + int handle, FilePath* download_directory) { DLOG(INFO) << "Handling download directory request"; if (tab_tracker_->ContainsHandle(handle)) { NavigationController* tab = tab_tracker_->GetResource(handle); DownloadManager* dlm = tab->profile()->GetDownloadManager(); DCHECK(dlm); - *download_directory = dlm->download_path().ToWStringHack(); + *download_directory = dlm->download_path(); } } diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index be11f91..6b72395 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -271,8 +271,7 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>, int y, IPC::Message* reply_message); - void GetDownloadDirectory(int handle, - std::wstring* download_directory); + void GetDownloadDirectory(int handle, FilePath* download_directory); // Retrieves a Browser from a Window and vice-versa. void GetWindowForBrowser(int window_handle, bool* success, int* handle); diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc index 3c134fd..7bd547d 100644 --- a/chrome/browser/download/download_uitest.cc +++ b/chrome/browser/download/download_uitest.cc @@ -88,7 +88,7 @@ class DownloadTest : public UITest { virtual void SetUp() { UITest::SetUp(); - download_prefix_ = FilePath::FromWStringHack(GetDownloadDirectory()); + download_prefix_ = GetDownloadDirectory(); } protected: diff --git a/chrome/browser/download/save_page_uitest.cc b/chrome/browser/download/save_page_uitest.cc index cf21ca3..1149397 100644 --- a/chrome/browser/download/save_page_uitest.cc +++ b/chrome/browser/download/save_page_uitest.cc @@ -46,7 +46,7 @@ class SavePageTest : public UITest { EXPECT_TRUE(file_util::CreateNewTempDirectory(FILE_PATH_LITERAL(""), &save_dir_)); - download_dir_ = FilePath::FromWStringHack(GetDownloadDirectory()); + download_dir_ = GetDownloadDirectory(); } virtual void TearDown() { |