Tweak the auto-open algorithm to permit JNLP to auto-open iff the user has...

chrome/browser/download/download_util.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
@@ skipping 744 matching lines @@
 FilePath GetCrDownloadPath(const FilePath& suggested_path) {
   FilePath::StringType file_name;
   base::SStringPrintf(
       &file_name,
       PRFilePathLiteral FILE_PATH_LITERAL(".crdownload"),
       suggested_path.value().c_str());
   return FilePath(file_name);
 }
 
 // TODO(erikkay,phajdan.jr): This is apparently not being exercised in tests.
-bool IsDangerous(DownloadCreateInfo* info, Profile* profile) {
+bool IsDangerous(DownloadCreateInfo* info, Profile* profile, bool auto_open) {
   DownloadDangerLevel danger_level = GetFileDangerLevel(
       info->suggested_path.BaseName());
 
   if (danger_level == Dangerous) {
+    if (auto_open && info->has_user_gesture) {

[Peter Kasting, 2011/01/28 23:51:25]

Two nits:

* Can condense this whole block to "return !auto_open ||
!info->has_user_gesture"

* Never "else" after "return" (please fix remainder of function while here).

+      return false;
+    }
     return true;
   } else if (danger_level == AllowOnUserGesture && !info->has_user_gesture) {
     return true;
   } else if (info->is_extension_install) {
     ExtensionService* service = profile->GetExtensionService();
     if (!service ||
         !service->IsDownloadFromGallery(info->url, info->referrer_url)) {
       // Extensions that are not from the gallery are considered dangerous.
       return true;
     }
   }
 
   return false;
 }
 
 }  // namespace download_util