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

Side by Side Diff: chrome/browser/download/download_browsertest.cc

Issue 9589003: Replace void* with int32 for passing download_id to SelectFileDialog::Listener. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix browser/unit tests Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/bind_helpers.h" 6 #include "base/bind_helpers.h"
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 class PickSuggestedFileDelegate : public ChromeDownloadManagerDelegate { 131 class PickSuggestedFileDelegate : public ChromeDownloadManagerDelegate {
132 public: 132 public:
133 explicit PickSuggestedFileDelegate(Profile* profile) 133 explicit PickSuggestedFileDelegate(Profile* profile)
134 : ChromeDownloadManagerDelegate(profile) { 134 : ChromeDownloadManagerDelegate(profile) {
135 SetDownloadManager( 135 SetDownloadManager(
136 DownloadServiceFactory::GetForProfile(profile)->GetDownloadManager()); 136 DownloadServiceFactory::GetForProfile(profile)->GetDownloadManager());
137 } 137 }
138 138
139 virtual void ChooseDownloadPath(WebContents* web_contents, 139 virtual void ChooseDownloadPath(WebContents* web_contents,
140 const FilePath& suggested_path, 140 const FilePath& suggested_path,
141 void* data) OVERRIDE { 141 int32 download_id) OVERRIDE {
142 if (download_manager_) 142 if (download_manager_)
143 download_manager_->FileSelected(suggested_path, data); 143 download_manager_->FileSelected(suggested_path, download_id);
144 } 144 }
145 }; 145 };
146 146
147 // Get History Information. 147 // Get History Information.
148 class DownloadsHistoryDataCollector { 148 class DownloadsHistoryDataCollector {
149 public: 149 public:
150 DownloadsHistoryDataCollector(int64 download_db_handle, 150 DownloadsHistoryDataCollector(int64 download_db_handle,
151 DownloadManager* manager) 151 DownloadManager* manager)
152 : result_valid_(false), 152 : result_valid_(false),
153 download_db_handle_(download_db_handle) { 153 download_db_handle_(download_db_handle) {
(...skipping 1920 matching lines...) Expand 10 before | Expand all | Expand 10 after
2074 "zip_file_not_found.zip", 2074 "zip_file_not_found.zip",
2075 DOWNLOAD_NAVIGATE, 2075 DOWNLOAD_NAVIGATE,
2076 DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED, 2076 DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED,
2077 false 2077 false
2078 }; 2078 };
2079 2079
2080 // Do initial setup. 2080 // Do initial setup.
2081 ASSERT_TRUE(InitialSetup(false)); 2081 ASSERT_TRUE(InitialSetup(false));
2082 DownloadFileCheckErrors(download_info); 2082 DownloadFileCheckErrors(download_info);
2083 } 2083 }
OLDNEW
« no previous file with comments | « chrome/browser/download/chrome_download_manager_delegate.cc ('k') | chrome/browser/download/download_file_picker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698