Remove DownloadShelf::CloseReason.

No DoClose() implementation actually reads this argument.

Bug: none
Change-Id: Iee84eb6f912351eb80f7655b26aabc586d3fef67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2248464
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Shakti Sahu <shaktisahu@chromium.org>
Reviewed-by: Shakti Sahu <shaktisahu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779323}

chrome/browser/download/download_browsertest.cc

@@ -4733,7 +4733,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, PerWindowShelf) {
   EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
 
   // Hide the download shelf.
-  browser()->window()->GetDownloadShelf()->Close(DownloadShelf::AUTOMATIC);
+  browser()->window()->GetDownloadShelf()->Close();
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 
   // Go to the first tab.

chrome/browser/download/download_shelf.cc

@@ -197,19 +197,17 @@ void DownloadShelf::AddDownload(DownloadUIModelPtr model) {
 }
 
 void DownloadShelf::Open() {
-  if (is_hidden_) {
+  if (is_hidden_)
     should_show_on_unhide_ = true;
-    return;
-  }
-  DoOpen();
+  else
+    DoOpen();
 }
 
-void DownloadShelf::Close(CloseReason reason) {
-  if (is_hidden_) {
+void DownloadShelf::Close() {
+  if (is_hidden_)
     should_show_on_unhide_ = false;
-    return;
-  }
-  DoClose(reason);
+  else
+    DoClose();
 }
 
 void DownloadShelf::Hide() {

chrome/browser/download/download_shelf.h

@@ -30,21 +30,6 @@ using DownloadUIModelPtr = DownloadUIModel::DownloadUIModelPtr;
 // implementations.
 class DownloadShelf {
  public:
-  // Reason for closing download shelf.
-  enum CloseReason {
-    // Closing the shelf automatically. E.g.: all remaining downloads in the
-    // shelf have been opened, last download in shelf was removed, or the
-    // browser is switching to full-screen mode.
-    AUTOMATIC,
-
-    // Closing shelf due to a user selection. E.g.: the user clicked on the
-    // 'close' button on the download shelf, or the shelf is being closed as a
-    // side-effect of the user opening the downloads page.
-    USER_ACTION
-  };
-
-  // Download progress animations ----------------------------------------------
-
   // Size of the space used for the progress indicator.
   static constexpr int kProgressIndicatorSize = 25;
 
@@ -90,7 +75,7 @@ class DownloadShelf {
   void Open();
 
   // Closes the shelf.
-  void Close(CloseReason reason);
+  void Close();
 
   // Hides the shelf. This closes the shelf if it is currently showing.
   void Hide();
@@ -107,7 +92,7 @@ class DownloadShelf {
  protected:
   virtual void DoAddDownload(DownloadUIModelPtr download) = 0;
   virtual void DoOpen() = 0;
-  virtual void DoClose(CloseReason reason) = 0;
+  virtual void DoClose() = 0;
   virtual void DoHide() = 0;
   virtual void DoUnhide() = 0;
 

chrome/browser/download/download_shelf_unittest.cc

@@ -86,7 +86,7 @@ TEST_F(DownloadShelfTest, ClosesShelfWhenHidden) {
 TEST_F(DownloadShelfTest, CloseWhileHiddenPreventsShowOnUnhide) {
   shelf()->Open();
   shelf()->Hide();
-  shelf()->Close(DownloadShelf::AUTOMATIC);
+  shelf()->Close();
   shelf()->Unhide();
   EXPECT_FALSE(shelf()->IsShowing());
 }

chrome/browser/download/test_download_shelf.cc

@@ -31,7 +31,7 @@ void TestDownloadShelf::DoOpen() {
   is_showing_ = true;
 }
 
-void TestDownloadShelf::DoClose(CloseReason reason) {
+void TestDownloadShelf::DoClose() {
   is_showing_ = false;
 }
 

chrome/browser/download/test_download_shelf.h

@@ -33,7 +33,7 @@ class TestDownloadShelf : public DownloadShelf {
  protected:
   void DoAddDownload(DownloadUIModelPtr download) override;
   void DoOpen() override;
-  void DoClose(CloseReason reason) override;
+  void DoClose() override;
   void DoHide() override;
   void DoUnhide() override;
   base::TimeDelta GetTransientDownloadShowDelay() override;

chrome/browser/extensions/api/downloads/downloads_api.cc

@@ -1563,7 +1563,7 @@ ExtensionFunction::ResponseAction DownloadsSetShelfEnabledFunction::Run() {
            (current_service == incognito_service)) &&
           browser->window()->IsDownloadShelfVisible() &&
           !current_service->IsShelfEnabled())
-        browser->window()->GetDownloadShelf()->Close(DownloadShelf::AUTOMATIC);
+        browser->window()->GetDownloadShelf()->Close();
     }
   }
 

chrome/browser/ui/chrome_pages.cc

@@ -315,7 +315,7 @@ void ShowHistory(Browser* browser) {
 void ShowDownloads(Browser* browser) {
   base::RecordAction(UserMetricsAction("ShowDownloads"));
   if (browser->window() && browser->window()->IsDownloadShelfVisible())
-    browser->window()->GetDownloadShelf()->Close(DownloadShelf::USER_ACTION);
+    browser->window()->GetDownloadShelf()->Close();
 
   ShowSingletonTabOverwritingNTP(
       browser,

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

@@ -138,7 +138,7 @@ void DownloadShelfView::DoAddDownload(
 }
 
 void DownloadShelfView::MouseMovedOutOfHost() {
-  Close(AUTOMATIC);
+  Close();
 }
 
 void DownloadShelfView::RemoveDownloadView(View* view) {
@@ -149,7 +149,7 @@ void DownloadShelfView::RemoveDownloadView(View* view) {
   RemoveChildView(view);
   delete view;
   if (download_views_.empty())
-    Close(AUTOMATIC);
+    Close();
   else if (CanAutoClose())
     mouse_watcher_.Start(GetWidget()->GetNativeWindow());
   Layout();
@@ -337,7 +337,7 @@ void DownloadShelfView::OnThemeChanged() {
 void DownloadShelfView::ButtonPressed(
     views::Button* button, const ui::Event& event) {
   if (button == close_button_)
-    Close(USER_ACTION);
+    Close();
   else if (button == show_all_view_)
     chrome::ShowDownloads(browser_);
   else
@@ -357,7 +357,7 @@ void DownloadShelfView::DoOpen() {
   shelf_animation_.Show();
 }
 
-void DownloadShelfView::DoClose(CloseReason reason) {
+void DownloadShelfView::DoClose() {
   parent_->SetDownloadShelfVisible(false);
   shelf_animation_.Hide();
 }

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

@@ -90,7 +90,7 @@ class DownloadShelfView : public views::AccessiblePaneView,
   // DownloadShelf:
   void DoAddDownload(DownloadUIModel::DownloadUIModelPtr download) override;
   void DoOpen() override;
-  void DoClose(CloseReason reason) override;
+  void DoClose() override;
   void DoHide() override;
   void DoUnhide() override;