summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-25 14:08:51 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-25 14:08:51 +0000
commitfd3ad516a833d0cdb3f39dad28b03526d53e3ddd (patch)
tree986448c608d2c6012da9c1cc065657171a7854f2 /chrome/chrome_browser.gypi
parentb3909d5383516d114432751463f39eb639cb1cfa (diff)
downloadchromium_src-fd3ad516a833d0cdb3f39dad28b03526d53e3ddd.zip
chromium_src-fd3ad516a833d0cdb3f39dad28b03526d53e3ddd.tar.gz
chromium_src-fd3ad516a833d0cdb3f39dad28b03526d53e3ddd.tar.bz2
Relanding this patch with the compile fix for Visual studio 2005. The compiler gets
confused between the two Delegate classes URLRequest::Delegate and the PluginDownloadHelper::Delegate class. Renaming the latter seems to work Fix a regression introduced in the chrome plugin installer on Windows in revision 54316 which was to remove usages of GetTempDir. However the change failed to take into account that the file name which is used to perform the download eventually is shell executed on windows. In this case the download was performed on a temporary file which causes ShellExecute to put up a confirmation dialog asking the user to select the application for opening the file. Fix is to rename the temp file path to the desired file path on success. Fixes bug http://code.google.com/p/chromium/issues/detail?id=56746 Bug=56746 Test=Covered by plugin installer plugin test. TBR=jam Review URL: http://codereview.chromium.org/3453025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0d57944..9740913 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2235,6 +2235,8 @@
'browser/platform_util_common_linux.cc',
'browser/platform_util_mac.mm',
'browser/platform_util_win.cc',
+ 'browser/plugin_download_helper.cc',
+ 'browser/plugin_download_helper.h',
'browser/plugin_exceptions_table_model.cc',
'browser/plugin_exceptions_table_model.h',
'browser/plugin_installer.cc',