Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: chrome/browser/download/download_shelf_context_menu.cc

Issue 10399069: Reland 137540 - Disable off-store extension installs by default. Also get rid of ExtensionService::… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/download/download_shelf_context_menu.h" 5 #include "chrome/browser/download/download_shelf_context_menu.h"
6 6
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/download/download_crx_util.h" 8 #include "chrome/browser/download/download_crx_util.h"
9 #include "chrome/browser/download/download_item_model.h" 9 #include "chrome/browser/download/download_item_model.h"
10 #include "chrome/browser/download/download_prefs.h" 10 #include "chrome/browser/download/download_prefs.h"
11 #include "chrome/browser/safe_browsing/download_protection_service.h" 11 #include "chrome/browser/safe_browsing/download_protection_service.h"
12 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 12 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
13 #include "chrome/common/extensions/extension.h" 13 #include "chrome/common/extensions/extension.h"
14 #include "chrome/common/extensions/extension_switch_utils.h"
14 #include "content/public/browser/download_item.h" 15 #include "content/public/browser/download_item.h"
15 #include "content/public/browser/download_manager.h" 16 #include "content/public/browser/download_manager.h"
16 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
17 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
18 19
19 using content::DownloadItem; 20 using content::DownloadItem;
20 21
21 DownloadShelfContextMenu::~DownloadShelfContextMenu() {} 22 DownloadShelfContextMenu::~DownloadShelfContextMenu() {}
22 23
23 DownloadShelfContextMenu::DownloadShelfContextMenu( 24 DownloadShelfContextMenu::DownloadShelfContextMenu(
(...skipping 19 matching lines...) Expand all
43 44
44 bool DownloadShelfContextMenu::IsCommandIdEnabled(int command_id) const { 45 bool DownloadShelfContextMenu::IsCommandIdEnabled(int command_id) const {
45 switch (command_id) { 46 switch (command_id) {
46 case SHOW_IN_FOLDER: 47 case SHOW_IN_FOLDER:
47 return download_item_->CanShowInFolder() && 48 return download_item_->CanShowInFolder() &&
48 !download_item_->IsTemporary(); 49 !download_item_->IsTemporary();
49 case OPEN_WHEN_COMPLETE: 50 case OPEN_WHEN_COMPLETE:
50 return download_item_->CanShowInFolder() && 51 return download_item_->CanShowInFolder() &&
51 !download_item_->IsTemporary() && 52 !download_item_->IsTemporary() &&
52 (!Extension::IsExtension(download_item_->GetTargetName()) || 53 (!Extension::IsExtension(download_item_->GetTargetName()) ||
53 download_crx_util::ShouldOpenExtensionDownload(*download_item_)); 54 extensions::switch_utils::IsOffStoreInstallEnabled());
54 case ALWAYS_OPEN_TYPE: 55 case ALWAYS_OPEN_TYPE:
55 // For temporary downloads, the target filename might be a temporary 56 // For temporary downloads, the target filename might be a temporary
56 // filename. Don't base an "Always open" decision based on it. Also 57 // filename. Don't base an "Always open" decision based on it. Also
57 // exclude extensions. 58 // exclude extensions.
58 return download_item_->CanOpenDownload() && 59 return download_item_->CanOpenDownload() &&
59 !Extension::IsExtension(download_item_->GetTargetName()) && 60 !Extension::IsExtension(download_item_->GetTargetName()) &&
60 !download_item_->IsTemporary(); 61 !download_item_->IsTemporary();
61 case CANCEL: 62 case CANCEL:
62 return download_item_->IsPartialDownload(); 63 return download_item_->IsPartialDownload();
63 case TOGGLE_PAUSE: 64 case TOGGLE_PAUSE:
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 malicious_download_menu_model_->AddItemWithStringId( 227 malicious_download_menu_model_->AddItemWithStringId(
227 DISCARD, IDS_DOWNLOAD_MENU_DISCARD); 228 DISCARD, IDS_DOWNLOAD_MENU_DISCARD);
228 malicious_download_menu_model_->AddItemWithStringId( 229 malicious_download_menu_model_->AddItemWithStringId(
229 KEEP, IDS_DOWNLOAD_MENU_KEEP); 230 KEEP, IDS_DOWNLOAD_MENU_KEEP);
230 malicious_download_menu_model_->AddSeparator(); 231 malicious_download_menu_model_->AddSeparator();
231 malicious_download_menu_model_->AddItemWithStringId( 232 malicious_download_menu_model_->AddItemWithStringId(
232 LEARN_MORE, IDS_DOWNLOAD_MENU_LEARN_MORE); 233 LEARN_MORE, IDS_DOWNLOAD_MENU_LEARN_MORE);
233 234
234 return malicious_download_menu_model_.get(); 235 return malicious_download_menu_model_.get();
235 } 236 }
OLDNEW
« no previous file with comments | « chrome/browser/download/download_crx_util.cc ('k') | chrome/browser/extensions/bundle_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698