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

Unified Diff: chrome/browser/plugins/plugin_installer.cc

Issue 11032052: Merge 160403 - Fix crash when a download is requested for an outdated plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1287/src/
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/plugins/plugin_installer.h ('k') | chrome/browser/plugins/plugin_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/plugin_installer.cc
===================================================================
--- chrome/browser/plugins/plugin_installer.cc (revision 160406)
+++ chrome/browser/plugins/plugin_installer.cc (working copy)
@@ -129,11 +129,9 @@
weak_observers_.RemoveObserver(observer);
}
-void PluginInstaller::StartInstalling(bool url_for_display,
- const GURL& plugin_url,
+void PluginInstaller::StartInstalling(const GURL& plugin_url,
TabContents* tab_contents) {
DCHECK_EQ(INSTALLER_STATE_IDLE, state_);
- DCHECK(url_for_display);
state_ = INSTALLER_STATE_DOWNLOADING;
FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadStarted());
content::WebContents* web_contents = tab_contents->web_contents();
@@ -174,11 +172,9 @@
download_item->AddObserver(this);
}
-void PluginInstaller::OpenDownloadURL(bool url_for_display,
- const GURL& plugin_url,
+void PluginInstaller::OpenDownloadURL(const GURL& plugin_url,
content::WebContents* web_contents) {
DCHECK_EQ(INSTALLER_STATE_IDLE, state_);
- DCHECK(url_for_display);
web_contents->OpenURL(content::OpenURLParams(
plugin_url,
content::Referrer(web_contents->GetURL(),
« no previous file with comments | « chrome/browser/plugins/plugin_installer.h ('k') | chrome/browser/plugins/plugin_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698