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/process/process.h" | 9 #include "base/process/process.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 const GURL& url, | 40 const GURL& url, |
41 content::ResourceContext* resource_context, | 41 content::ResourceContext* resource_context, |
42 int render_process_host_id, | 42 int render_process_host_id, |
43 int render_view_host_routing_id, | 43 int render_view_host_routing_id, |
44 const ResourceDispatcherHost::DownloadStartedCallback& callback) { | 44 const ResourceDispatcherHost::DownloadStartedCallback& callback) { |
45 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 45 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
46 | 46 |
47 ResourceDispatcherHost* rdh = ResourceDispatcherHost::Get(); | 47 ResourceDispatcherHost* rdh = ResourceDispatcherHost::Get(); |
48 scoped_ptr<net::URLRequest> request( | 48 scoped_ptr<net::URLRequest> request( |
49 resource_context->GetRequestContext()->CreateRequest( | 49 resource_context->GetRequestContext()->CreateRequest( |
50 url, net::DEFAULT_PRIORITY, NULL)); | 50 url, net::DEFAULT_PRIORITY, NULL, NULL)); |
51 content::DownloadInterruptReason error = rdh->BeginDownload( | 51 content::DownloadInterruptReason error = rdh->BeginDownload( |
52 request.Pass(), | 52 request.Pass(), |
53 content::Referrer(), | 53 content::Referrer(), |
54 false, // is_content_initiated | 54 false, // is_content_initiated |
55 resource_context, | 55 resource_context, |
56 render_process_host_id, | 56 render_process_host_id, |
57 render_view_host_routing_id, | 57 render_view_host_routing_id, |
58 true, // prefer_cache | 58 true, // prefer_cache |
59 scoped_ptr<content::DownloadSaveInfo>(new content::DownloadSaveInfo()), | 59 scoped_ptr<content::DownloadSaveInfo>(new content::DownloadSaveInfo()), |
60 content::DownloadItem::kInvalidId, | 60 content::DownloadItem::kInvalidId, |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); | 186 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); |
187 state_ = INSTALLER_STATE_IDLE; | 187 state_ = INSTALLER_STATE_IDLE; |
188 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadError(msg)); | 188 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadError(msg)); |
189 } | 189 } |
190 | 190 |
191 void PluginInstaller::DownloadCancelled() { | 191 void PluginInstaller::DownloadCancelled() { |
192 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); | 192 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); |
193 state_ = INSTALLER_STATE_IDLE; | 193 state_ = INSTALLER_STATE_IDLE; |
194 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled()); | 194 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled()); |
195 } | 195 } |
OLD | NEW |