Merge 20772 - Fix autoopening file types not autoopening....

chrome/browser/download/download_manager.cc

Index: chrome/browser/download/download_manager.cc
===================================================================
--- chrome/browser/download/download_manager.cc	(revision 20775)
+++ chrome/browser/download/download_manager.cc	(working copy)
@@ -833,15 +833,18 @@
   // state to complete but did not notify).
   download->UpdateObservers();
 
-  // Open the download if the user or user prefs indicate it should be.
-  FilePath::StringType extension = download->full_path().Extension();
-
   // Handle chrome extensions explicitly and skip the shell execute.
   if (Extension::IsExtension(download->full_path())) {
     OpenChromeExtension(download->full_path());
     return;
   }
 
+  // Open the download if the user or user prefs indicate it should be.
+  FilePath::StringType extension = download->full_path().Extension();
+  // Drop the leading period. (The auto-open list is period-less.)
+  if (extension.size() > 0)
+    extension = extension.substr(1);
+
   if (download->open_when_complete() || ShouldOpenFileExtension(extension))
     OpenDownloadInShell(download, NULL);
 }
Property changes on: chrome\browser\download\download_manager.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/chrome/browser/download/download_manager.cc:r20772
   Merged /branches/chrome_webkit_merge_branch/chrome/browser/download/download_manager.cc:r69-2775