Remove DownloadItemView::State.

This is only ever used to track if the dropdown is pressed; replace it
with a bool.

Also removes SchedulePaint() calls around changing the dropdown image,
which should be done automatically and thus are redundant.

Bug: none
Change-Id: I457db5f1bc953d0c97cc51b77a13c433d80c6fd4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2305373
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Xing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790201}

chrome/browser/ui/views/download/download_item_view.cc

@@ -475,7 +475,7 @@ void DownloadItemView::ButtonPressed(views::Button* sender,
   }
 
   if (sender == dropdown_button_) {
-    SetDropdownState(PUSHED);
+    SetDropdownPressed(true);
     ShowContextMenuImpl(dropdown_button_->GetBoundsInScreen(),
                         ui::GetMenuSourceTypeForEvent(event));
     return;
@@ -762,8 +762,7 @@ void DownloadItemView::OnThemeChanged() {
   shelf_->ConfigureButtonForTheme(discard_button_);
   shelf_->ConfigureButtonForTheme(scan_button_);
 
-  SchedulePaint();
-  UpdateDropdownButton();
+  UpdateDropdownButtonImage();
 }
 
 DownloadItemView::Mode DownloadItemView::GetDesiredMode() const {
@@ -1222,22 +1221,20 @@ int DownloadItemView::GetLabelWidth(const views::StyledLabel& label) const {
                                     std::move(lines_for_width));
 }
 
-void DownloadItemView::SetDropdownState(State new_state) {
-  if (new_state != dropdown_state_) {
-    dropdown_button_->AnimateInkDrop(new_state == PUSHED
+void DownloadItemView::SetDropdownPressed(bool pressed) {
+  if (dropdown_pressed_ != pressed) {
+    dropdown_pressed_ = pressed;
+    dropdown_button_->AnimateInkDrop(dropdown_pressed_
                                          ? views::InkDropState::ACTIVATED
                                          : views::InkDropState::DEACTIVATED,
                                      nullptr);
-    dropdown_state_ = new_state;
-    UpdateDropdownButton();
-    SchedulePaint();
+    UpdateDropdownButtonImage();
   }
 }
 
-void DownloadItemView::UpdateDropdownButton() {
+void DownloadItemView::UpdateDropdownButtonImage() {
   views::SetImageFromVectorIcon(
-      dropdown_button_,
-      dropdown_state_ == PUSHED ? kCaretDownIcon : kCaretUpIcon,
+      dropdown_button_, dropdown_pressed_ ? kCaretDownIcon : kCaretUpIcon,
       GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));
 }
 
@@ -1279,7 +1276,7 @@ void DownloadItemView::ShowContextMenuImpl(const gfx::Rect& rect,
   if (!context_menu_.get())
     context_menu_ = std::make_unique<DownloadShelfContextMenuView>(this);
   const auto release_dropdown = [](DownloadItemView* view) {
-    view->SetDropdownState(NORMAL);
+    view->SetDropdownPressed(false);
     // Make sure any new status from activating a context menu option is read.
     view->announce_accessible_alert_soon_ = true;
   };

chrome/browser/ui/views/download/download_item_view.h

@@ -116,8 +116,6 @@ class DownloadItemView : public views::View,
   void OnThemeChanged() override;
 
  private:
-  enum State { NORMAL = 0, HOT, PUSHED };
-
   // Returns the mode that best reflects the current model state.
   Mode GetDesiredMode() const;
 
@@ -188,10 +186,10 @@ class DownloadItemView : public views::View,
   int GetLabelWidth(const views::StyledLabel& label) const;
 
   // Sets the state and triggers a repaint.
-  void SetDropdownState(State new_state);
+  void SetDropdownPressed(bool pressed);
 
   // Sets |dropdown_button_| to have the correct image for the current state.
-  void UpdateDropdownButton();
+  void UpdateDropdownButtonImage();
 
   // Shows an appropriate prompt dialog when the user hits the "open" button
   // when not in normal mode.
@@ -269,8 +267,8 @@ class DownloadItemView : public views::View,
   views::MdTextButton* scan_button_;
   views::ImageButton* dropdown_button_;
 
-  // The current state (normal, hot or pushed) of the body and drop-down.
-  State dropdown_state_ = NORMAL;
+  // Whether the dropdown is currently pressed.
+  bool dropdown_pressed_ = false;
 
   std::unique_ptr<DownloadShelfContextMenuView> context_menu_;