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

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

Issue 15011006: Remove DownloadItem::GetUserVerifiedFilePath() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with r201294 Created 7 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"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 switch (static_cast<ContextMenuCommands>(command_id)) { 108 switch (static_cast<ContextMenuCommands>(command_id)) {
109 case SHOW_IN_FOLDER: 109 case SHOW_IN_FOLDER:
110 download_item_->ShowDownloadInShell(); 110 download_item_->ShowDownloadInShell();
111 break; 111 break;
112 case OPEN_WHEN_COMPLETE: 112 case OPEN_WHEN_COMPLETE:
113 download_item_->OpenDownload(); 113 download_item_->OpenDownload();
114 break; 114 break;
115 case ALWAYS_OPEN_TYPE: { 115 case ALWAYS_OPEN_TYPE: {
116 DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( 116 DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
117 download_item_->GetBrowserContext()); 117 download_item_->GetBrowserContext());
118 base::FilePath path = download_item_->GetUserVerifiedFilePath(); 118 base::FilePath path = download_item_->GetTargetFilePath();
119 if (!IsCommandIdChecked(ALWAYS_OPEN_TYPE)) 119 if (!IsCommandIdChecked(ALWAYS_OPEN_TYPE))
120 prefs->EnableAutoOpenBasedOnExtension(path); 120 prefs->EnableAutoOpenBasedOnExtension(path);
121 else 121 else
122 prefs->DisableAutoOpenBasedOnExtension(path); 122 prefs->DisableAutoOpenBasedOnExtension(path);
123 break; 123 break;
124 } 124 }
125 case CANCEL: 125 case CANCEL:
126 download_item_->Cancel(true /* Cancelled by user */); 126 download_item_->Cancel(true /* Cancelled by user */);
127 break; 127 break;
128 case TOGGLE_PAUSE: 128 case TOGGLE_PAUSE:
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 malicious_download_menu_model_->AddItemWithStringId( 291 malicious_download_menu_model_->AddItemWithStringId(
292 DISCARD, IDS_DOWNLOAD_MENU_DISCARD); 292 DISCARD, IDS_DOWNLOAD_MENU_DISCARD);
293 malicious_download_menu_model_->AddItemWithStringId( 293 malicious_download_menu_model_->AddItemWithStringId(
294 KEEP, IDS_DOWNLOAD_MENU_KEEP); 294 KEEP, IDS_DOWNLOAD_MENU_KEEP);
295 malicious_download_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR); 295 malicious_download_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
296 malicious_download_menu_model_->AddItemWithStringId( 296 malicious_download_menu_model_->AddItemWithStringId(
297 LEARN_MORE_SCANNING, IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING); 297 LEARN_MORE_SCANNING, IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING);
298 298
299 return malicious_download_menu_model_.get(); 299 return malicious_download_menu_model_.get();
300 } 300 }
OLDNEW
« no previous file with comments | « chrome/browser/automation/testing_automation_provider.cc ('k') | chrome/browser/extensions/api/downloads/downloads_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698