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

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

Issue 11711003: Remove the DownloadItem::TogglePause() interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync'd to r175145. Created 7 years, 11 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 prefs->DisableAutoOpenBasedOnExtension(path); 105 prefs->DisableAutoOpenBasedOnExtension(path);
106 break; 106 break;
107 } 107 }
108 case CANCEL: 108 case CANCEL:
109 download_model_->CancelTask(); 109 download_model_->CancelTask();
110 break; 110 break;
111 case TOGGLE_PAUSE: 111 case TOGGLE_PAUSE:
112 // It is possible for the download to complete before the user clicks the 112 // It is possible for the download to complete before the user clicks the
113 // menu item, recheck if the download is in progress state before toggling 113 // menu item, recheck if the download is in progress state before toggling
114 // pause. 114 // pause.
115 if (download_item_->IsPartialDownload()) 115 if (download_item_->IsPartialDownload()) {
116 download_item_->TogglePause(); 116 if (download_item_->IsPaused())
117 download_item_->Resume();
118 else
119 download_item_->Pause();
120 }
117 break; 121 break;
118 case DISCARD: 122 case DISCARD:
119 download_item_->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD); 123 download_item_->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
120 break; 124 break;
121 case KEEP: 125 case KEEP:
122 download_item_->DangerousDownloadValidated(); 126 download_item_->DangerousDownloadValidated();
123 break; 127 break;
124 case LEARN_MORE_SCANNING: { 128 case LEARN_MORE_SCANNING: {
125 #if defined(FULL_SAFE_BROWSING) 129 #if defined(FULL_SAFE_BROWSING)
126 using safe_browsing::DownloadProtectionService; 130 using safe_browsing::DownloadProtectionService;
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 malicious_download_menu_model_->AddItemWithStringId( 265 malicious_download_menu_model_->AddItemWithStringId(
262 DISCARD, IDS_DOWNLOAD_MENU_DISCARD); 266 DISCARD, IDS_DOWNLOAD_MENU_DISCARD);
263 malicious_download_menu_model_->AddItemWithStringId( 267 malicious_download_menu_model_->AddItemWithStringId(
264 KEEP, IDS_DOWNLOAD_MENU_KEEP); 268 KEEP, IDS_DOWNLOAD_MENU_KEEP);
265 malicious_download_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR); 269 malicious_download_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
266 malicious_download_menu_model_->AddItemWithStringId( 270 malicious_download_menu_model_->AddItemWithStringId(
267 LEARN_MORE_SCANNING, IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING); 271 LEARN_MORE_SCANNING, IDS_DOWNLOAD_MENU_LEARN_MORE_SCANNING);
268 272
269 return malicious_download_menu_model_.get(); 273 return malicious_download_menu_model_.get();
270 } 274 }
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