Bug fix for 10876, file extension handling refactoring

chrome/browser/download/download_shelf.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/download/download_shelf.h"
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/dom_ui/downloads_ui.h"
@@ skipping 14 matching lines @@
 
 DownloadShelfContextMenu::~DownloadShelfContextMenu() {
 }
 
 bool DownloadShelfContextMenu::ItemIsChecked(int id) const {
   switch (id) {
     case OPEN_WHEN_COMPLETE: {
       return download_->open_when_complete();
     }
     case ALWAYS_OPEN_TYPE: {
-      const FilePath::StringType extension =
-          file_util::GetFileExtensionFromPath(download_->full_path());
-      return download_->manager()->ShouldOpenFileExtension(extension);
+      return download_->manager()->ShouldOpenFileBasedOnExtension(
+          download_->full_path());
     }
     case TOGGLE_PAUSE: {
       return download_->is_paused();
     }
   }
   return false;
 }
 
 bool DownloadShelfContextMenu::ItemIsDefault(int id) const {
   return id == OPEN_WHEN_COMPLETE;
@@ skipping 41 matching lines @@
 
 void DownloadShelfContextMenu::ExecuteItemCommand(int id) {
   switch (id) {
     case SHOW_IN_FOLDER:
       download_->manager()->ShowDownloadInShell(download_);
       break;
     case OPEN_WHEN_COMPLETE:
       download_util::OpenDownload(download_);
       break;
     case ALWAYS_OPEN_TYPE: {
-      const FilePath::StringType extension =
-          file_util::GetFileExtensionFromPath(download_->full_path());
-      download_->manager()->OpenFilesOfExtension(
-          extension, !ItemIsChecked(ALWAYS_OPEN_TYPE));
+      download_->manager()->OpenFilesBasedOnExtension(
+          download_->full_path(), !ItemIsChecked(ALWAYS_OPEN_TYPE));
       break;
     }
     case CANCEL:
       model_->CancelTask();
       break;
     case TOGGLE_PAUSE:
       // It is possible for the download to complete before the user clicks the
       // menu item, recheck if the download is in progress state before toggling
       // pause.
       if (download_->state() == DownloadItem::IN_PROGRESS)
         download_->TogglePause();
       break;
     default:
       NOTREACHED();
   }
 }