MD Download items - fix mode checks to include both dangerous and

chrome/browser/ui/views/download/download_item_view_md.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/ui/views/download/download_item_view_md.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 827 matching lines @@
                             weak_ptr_factory_.GetWeakPtr()));
 
   if (!context_menu_.get())
     context_menu_.reset(new DownloadShelfContextMenuView(download()));
   context_menu_->Run(GetWidget()->GetTopLevelWidget(), rect, source_type);
   // We could be deleted now.
 }
 
 void DownloadItemViewMd::HandlePressEvent(const ui::LocatedEvent& event,
                                           bool active_event) {
-  // The event should not activate us in dangerous mode.
-  if (mode_ == DANGEROUS_MODE)
+  // The event should not activate us in dangerous/malicious mode.
+  if (IsShowingWarningDialog())
     return;
 
   // Stop any completion animation.
   if (complete_animation_.get() && complete_animation_->is_animating())
     complete_animation_->End();
 
   // Don't show the ripple for right clicks.
   if (!active_event)
     return;
 
   AnimateInkDrop(views::InkDropState::ACTION_PENDING, &event);
 }
 
 void DownloadItemViewMd::HandleClickEvent(const ui::LocatedEvent& event,
                                           bool active_event) {
-  // Mouse should not activate us in dangerous mode.
-  if (mode_ == DANGEROUS_MODE)
-    return;
-
+  // The event should not activate us in dangerous/malicious mode.
   if (!active_event || IsShowingWarningDialog())
     return;
 
   AnimateInkDrop(views::InkDropState::ACTION_TRIGGERED, &event);
 
   // OpenDownload may delete this, so don't add any code after this line.
   OpenDownload();
 }
 
 void DownloadItemViewMd::SetDropdownState(State new_state) {
@@ skipping 27 matching lines @@
   LoadIcon();
 
   // Force the shelf to layout again as our size has changed.
   shelf_->Layout();
   shelf_->SchedulePaint();
 }
 
 void DownloadItemViewMd::ClearWarningDialog() {
   DCHECK(download()->GetDangerType() ==
          content::DOWNLOAD_DANGER_TYPE_USER_VALIDATED);
-  DCHECK(mode_ == DANGEROUS_MODE || mode_ == MALICIOUS_MODE);
+  DCHECK(IsShowingWarningDialog());
 
   mode_ = NORMAL_MODE;
   dropdown_state_ = NORMAL;
 
   // ExperienceSampling: User proceeded through the warning.
   if (sampling_event_.get()) {
     sampling_event_->CreateUserDecisionEvent(ExperienceSamplingEvent::kProceed);
     sampling_event_.reset(NULL);
   }
   // Remove the views used by the warning dialog.
@@ skipping 207 matching lines @@
     SchedulePaint();
 }
 
 SkColor DownloadItemViewMd::GetTextColor() const {
   return GetTextColorForThemeProvider(GetThemeProvider());
 }
 
 SkColor DownloadItemViewMd::GetDimmedTextColor() const {
   return SkColorSetA(GetTextColor(), 0xC7);
 }