Revert 137540 - Disable off-store extension installs by default. Also get rid of ExtensionService::…

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"
 #include "chrome/browser/safe_browsing/download_protection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_switch_utils.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::DownloadItem;
 
 DownloadShelfContextMenu::~DownloadShelfContextMenu() {}
 
 DownloadShelfContextMenu::DownloadShelfContextMenu(
@@ skipping 19 matching lines @@
 
 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_crx_util::ShouldOpenExtensionDownload(*download_item_));
     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_item_->IsTemporary();
     case CANCEL:
       return download_item_->IsPartialDownload();
     case TOGGLE_PAUSE:
@@ skipping 162 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();
 }