Improve the UI for disabling off-store extension install.

chrome/browser/download/download_shelf_context_menu.cc

 // Copyright (c) 2012 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_context_menu.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_prefs.h"
@@ skipping 35 matching lines @@
   return model;
 }
 
 bool DownloadShelfContextMenu::IsCommandIdEnabled(int command_id) const {
   switch (command_id) {
     case SHOW_IN_FOLDER:
       return download_item_->CanShowInFolder() &&
           !download_item_->IsTemporary();
     case OPEN_WHEN_COMPLETE:
       return download_item_->CanShowInFolder() &&
-          !download_item_->IsTemporary() &&
-          (!Extension::IsExtension(download_item_->GetTargetName()) ||
-           extensions::switch_utils::IsOffStoreInstallEnabled());
+          !download_item_->IsTemporary();

[asanka, 2012/05/25 18:28:18]

The confusingly named OPEN_WHEN_COMPLETE option means "Open when complete" while
DownloadItem::IsInProgress() and means "Open" after the download is complete.

It looks like you want the option to only be enabled if:

  download_item_->CanShowInFolder() &&
  !download_item_->IsTemporary() &&
  (!download_crx_util::IsExtensionDownload(*download_item_) ||
   download_item_->IsComplete())

(The '|| download_item->IsComplete()' part won't matter much since the download
item will disappear when the extension auto opens.)

     case ALWAYS_OPEN_TYPE:
       // For temporary downloads, the target filename might be a temporary
       // filename. Don't base an "Always open" decision based on it. Also
       // exclude extensions.
       return download_item_->CanOpenDownload() &&
-          !Extension::IsExtension(download_item_->GetTargetName()) &&
+          !download_crx_util::IsExtensionDownload(*download_item_) &&
           !download_item_->IsTemporary();
     case CANCEL:
       return download_item_->IsPartialDownload();
     case TOGGLE_PAUSE:
       return download_item_->IsInProgress();
     default:
       return command_id > 0 && command_id < MENU_LAST;
   }
 }
 
 bool DownloadShelfContextMenu::IsCommandIdChecked(int command_id) const {
   switch (command_id) {
     case OPEN_WHEN_COMPLETE:
       return download_item_->GetOpenWhenComplete();

[asanka, 2012/05/25 18:28:18]

This should ideally also return true for extensions. The menu item would then
appear checked but disabled, which represents what will happen when the download
completes.

     case ALWAYS_OPEN_TYPE:
       return download_item_->ShouldOpenFileBasedOnExtension();
     case TOGGLE_PAUSE:
       return download_item_->IsPaused();
   }
   return false;
 }
 
 void DownloadShelfContextMenu::ExecuteCommand(int command_id) {
   switch (command_id) {
@@ skipping 143 matching lines @@
   malicious_download_menu_model_->AddItemWithStringId(
       DISCARD, IDS_DOWNLOAD_MENU_DISCARD);
   malicious_download_menu_model_->AddItemWithStringId(
       KEEP, IDS_DOWNLOAD_MENU_KEEP);
   malicious_download_menu_model_->AddSeparator();
   malicious_download_menu_model_->AddItemWithStringId(
       LEARN_MORE, IDS_DOWNLOAD_MENU_LEARN_MORE);
 
   return malicious_download_menu_model_.get();
 }