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 <utility> |
| 8 |
7 #include "base/bind.h" | 9 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
9 #include "base/process/process.h" | 11 #include "base/process/process.h" |
10 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
11 #include "chrome/browser/download/download_stats.h" | 13 #include "chrome/browser/download/download_stats.h" |
12 #include "chrome/browser/platform_util.h" | 14 #include "chrome/browser/platform_util.h" |
13 #include "chrome/browser/plugins/plugin_installer_observer.h" | 15 #include "chrome/browser/plugins/plugin_installer_observer.h" |
14 #include "content/public/browser/browser_context.h" | 16 #include "content/public/browser/browser_context.h" |
15 #include "content/public/browser/download_item.h" | 17 #include "content/public/browser/download_item.h" |
16 #include "content/public/browser/download_manager.h" | 18 #include "content/public/browser/download_manager.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 content::DownloadManager* download_manager) { | 102 content::DownloadManager* download_manager) { |
101 DCHECK_EQ(INSTALLER_STATE_IDLE, state_); | 103 DCHECK_EQ(INSTALLER_STATE_IDLE, state_); |
102 state_ = INSTALLER_STATE_DOWNLOADING; | 104 state_ = INSTALLER_STATE_DOWNLOADING; |
103 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadStarted()); | 105 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadStarted()); |
104 scoped_ptr<content::DownloadUrlParameters> download_parameters( | 106 scoped_ptr<content::DownloadUrlParameters> download_parameters( |
105 content::DownloadUrlParameters::FromWebContents(web_contents, | 107 content::DownloadUrlParameters::FromWebContents(web_contents, |
106 plugin_url)); | 108 plugin_url)); |
107 download_parameters->set_callback( | 109 download_parameters->set_callback( |
108 base::Bind(&PluginInstaller::DownloadStarted, base::Unretained(this))); | 110 base::Bind(&PluginInstaller::DownloadStarted, base::Unretained(this))); |
109 RecordDownloadSource(DOWNLOAD_INITIATED_BY_PLUGIN_INSTALLER); | 111 RecordDownloadSource(DOWNLOAD_INITIATED_BY_PLUGIN_INSTALLER); |
110 download_manager->DownloadUrl(download_parameters.Pass()); | 112 download_manager->DownloadUrl(std::move(download_parameters)); |
111 } | 113 } |
112 | 114 |
113 void PluginInstaller::DownloadStarted( | 115 void PluginInstaller::DownloadStarted( |
114 content::DownloadItem* item, | 116 content::DownloadItem* item, |
115 content::DownloadInterruptReason interrupt_reason) { | 117 content::DownloadInterruptReason interrupt_reason) { |
116 if (interrupt_reason != content::DOWNLOAD_INTERRUPT_REASON_NONE) { | 118 if (interrupt_reason != content::DOWNLOAD_INTERRUPT_REASON_NONE) { |
117 std::string msg = base::StringPrintf( | 119 std::string msg = base::StringPrintf( |
118 "Error %d: %s", | 120 "Error %d: %s", |
119 interrupt_reason, | 121 interrupt_reason, |
120 content::DownloadInterruptReasonToString(interrupt_reason).c_str()); | 122 content::DownloadInterruptReasonToString(interrupt_reason).c_str()); |
(...skipping 19 matching lines...) Expand all Loading... |
140 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); | 142 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); |
141 state_ = INSTALLER_STATE_IDLE; | 143 state_ = INSTALLER_STATE_IDLE; |
142 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadError(msg)); | 144 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadError(msg)); |
143 } | 145 } |
144 | 146 |
145 void PluginInstaller::DownloadCancelled() { | 147 void PluginInstaller::DownloadCancelled() { |
146 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); | 148 DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_); |
147 state_ = INSTALLER_STATE_IDLE; | 149 state_ = INSTALLER_STATE_IDLE; |
148 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled()); | 150 FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled()); |
149 } | 151 } |
OLD | NEW |