OLD | NEW |
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 "chrome/browser/plugins/plugin_installer.h" | 5 #include "chrome/browser/plugins/plugin_installer.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/process.h" | 10 #include "base/process.h" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 scoped_ptr<net::URLRequest> request( | 48 scoped_ptr<net::URLRequest> request( |
49 resource_context->GetRequestContext()->CreateRequest(url, NULL)); | 49 resource_context->GetRequestContext()->CreateRequest(url, NULL)); |
50 net::Error error = rdh->BeginDownload( | 50 net::Error error = rdh->BeginDownload( |
51 request.Pass(), | 51 request.Pass(), |
52 false, // is_content_initiated | 52 false, // is_content_initiated |
53 resource_context, | 53 resource_context, |
54 render_process_host_id, | 54 render_process_host_id, |
55 render_view_host_routing_id, | 55 render_view_host_routing_id, |
56 true, // prefer_cache | 56 true, // prefer_cache |
57 scoped_ptr<content::DownloadSaveInfo>(new content::DownloadSaveInfo()), | 57 scoped_ptr<content::DownloadSaveInfo>(new content::DownloadSaveInfo()), |
| 58 content::DownloadId::Invalid(), |
58 callback); | 59 callback); |
59 | 60 |
60 if (error != net::OK) { | 61 if (error != net::OK) { |
61 BrowserThread::PostTask( | 62 BrowserThread::PostTask( |
62 BrowserThread::UI, FROM_HERE, | 63 BrowserThread::UI, FROM_HERE, |
63 base::Bind(callback, static_cast<DownloadItem*>(NULL), error)); | 64 base::Bind(callback, static_cast<DownloadItem*>(NULL), error)); |
64 } | 65 } |
65 } | 66 } |
66 | 67 |
67 } // namespace | 68 } // namespace |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); | 184 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); |
184 state_ = INSTALLER_STATE_IDLE; | 185 state_ = INSTALLER_STATE_IDLE; |
185 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadError(msg)); | 186 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadError(msg)); |
186 } | 187 } |
187 | 188 |
188 void PluginInstaller::DownloadCancelled() { | 189 void PluginInstaller::DownloadCancelled() { |
189 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); | 190 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); |
190 state_ = INSTALLER_STATE_IDLE; | 191 state_ = INSTALLER_STATE_IDLE; |
191 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled()); | 192 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled()); |
192 } | 193 } |
OLD | NEW |