Download Shelf : Changed DownloadShelfContextMenu to work with DownloadUIModel

Bug: 885322
Change-Id: Id509eb2009958b2532a428abd8db5156a7c026ae
Reviewed-on: https://chromium-review.googlesource.com/1232477
Commit-Queue: Shakti Sahu <shaktisahu@chromium.org>
Reviewed-by: Min Qin <qinmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592667}

chrome/browser/download/download_shelf_context_menu.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/download/download_shelf_context_menu.h"
 
 #include "build/build_config.h"
-#include "chrome/browser/download/download_item_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/common/content_features.h"
 #include "extensions/common/extension.h"
@@ -15,43 +14,41 @@
 #include "chrome/browser/ui/pdf/adobe_reader_info_win.h"
 #endif
 
-using download::DownloadItem;
-
 bool DownloadShelfContextMenu::WantsContextMenu(
-    const DownloadItemModel& download_model) {
-  return !download_model.IsDangerous() || download_model.MightBeMalicious();
+    DownloadUIModel* download_model) {
+  return !download_model->IsDangerous() || !download_model->MightBeMalicious();
 }
 
 DownloadShelfContextMenu::~DownloadShelfContextMenu() {
   DetachFromDownloadItem();
 }
 
-DownloadShelfContextMenu::DownloadShelfContextMenu(DownloadItem* download_item)
-    : download_item_(download_item),
-      download_commands_(new DownloadCommands(download_item)) {
-  DCHECK(download_item_);
-  download_item_->AddObserver(this);
+DownloadShelfContextMenu::DownloadShelfContextMenu(DownloadUIModel* download)
+    : download_(download),
+      // TODO(shaktisahu) : Fix DownloadCommands construction.
+      download_commands_(
+          new DownloadCommands(download_->GetDownloadCommands())) {
+  DCHECK(download_);
+  download_->AddObserver(this);
 }
 
 ui::SimpleMenuModel* DownloadShelfContextMenu::GetMenuModel() {
   ui::SimpleMenuModel* model = NULL;
 
-  if (!download_item_)
+  if (!download_)
     return NULL;
 
-  DownloadItemModel download_model(download_item_);
-
-  DCHECK(WantsContextMenu(download_model));
+  DCHECK(WantsContextMenu(download_));
 
-  if (download_model.IsMalicious())
+  if (download_->IsMalicious())
     model = GetMaliciousMenuModel();
-  else if (download_model.MightBeMalicious())
+  else if (download_->MightBeMalicious())
     model = GetMaybeMaliciousMenuModel();
-  else if (download_item_->GetState() == DownloadItem::COMPLETE)
+  else if (download_->GetState() == download::DownloadItem::COMPLETE)
     model = GetFinishedMenuModel();
-  else if (download_item_->GetState() == DownloadItem::INTERRUPTED)
+  else if (download_->GetState() == download::DownloadItem::INTERRUPTED)
     model = GetInterruptedMenuModel();
-  else if (download_item_->IsPaused())
+  else if (download_->IsPaused())
     model = GetInProgressPausedMenuModel();
   else
     model = GetInProgressMenuModel();
@@ -100,7 +97,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCommandId(
 
   switch (static_cast<DownloadCommands::Command>(command_id)) {
     case DownloadCommands::OPEN_WHEN_COMPLETE:
-      if (download_item_ && !download_item_->IsDone())
+      if (download_ && !download_->IsDone())
         id = IDS_DOWNLOAD_MENU_OPEN_WHEN_COMPLETE;
       else
         id = IDS_DOWNLOAD_MENU_OPEN;
@@ -164,16 +161,15 @@ base::string16 DownloadShelfContextMenu::GetLabelForCommandId(
 }
 
 void DownloadShelfContextMenu::DetachFromDownloadItem() {
-  if (!download_item_)
+  if (!download_)
     return;
 
   download_commands_.reset();
-  download_item_->RemoveObserver(this);
-  download_item_ = NULL;
+  download_->RemoveObserver(this);
+  download_ = NULL;
 }
 
-void DownloadShelfContextMenu::OnDownloadDestroyed(DownloadItem* download) {
-  DCHECK(download_item_ == download);
+void DownloadShelfContextMenu::OnDownloadDestroyed() {
   DetachFromDownloadItem();
 }
 

chrome/browser/download/download_shelf_context_menu.h

@@ -12,28 +12,25 @@
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/download/download_commands.h"
+#include "chrome/browser/download/download_ui_model.h"
 #include "components/download/public/common/download_item.h"
 #include "ui/base/models/simple_menu_model.h"
 
-class DownloadItemModel;
-
 // This class is responsible for the download shelf context menu. Platform
 // specific subclasses are responsible for creating and running the menu.
 //
 // The DownloadItem corresponding to the context menu is observed for removal or
 // destruction.
 class DownloadShelfContextMenu : public ui::SimpleMenuModel::Delegate,
-                                 public download::DownloadItem::Observer {
+                                 public DownloadUIModel::Observer {
  public:
   // Only show a context menu for a dangerous download if it is malicious.
-  static bool WantsContextMenu(const DownloadItemModel&);
+  static bool WantsContextMenu(DownloadUIModel* download_model);
 
   ~DownloadShelfContextMenu() override;
 
-  download::DownloadItem* download_item() const { return download_item_; }
-
  protected:
-  explicit DownloadShelfContextMenu(download::DownloadItem* download_item);
+  explicit DownloadShelfContextMenu(DownloadUIModel* download);
 
   // Returns the correct menu model depending on the state of the download item.
   // Returns NULL if the download was destroyed.
@@ -52,8 +49,8 @@ class DownloadShelfContextMenu : public ui::SimpleMenuModel::Delegate,
   // destroyed or when this object is being destroyed.
   void DetachFromDownloadItem();
 
-  // download::DownloadItem::Observer
-  void OnDownloadDestroyed(download::DownloadItem* download) override;
+  // DownloadUIModel::Observer overrides.
+  void OnDownloadDestroyed() override;
 
   ui::SimpleMenuModel* GetInProgressMenuModel();
   ui::SimpleMenuModel* GetInProgressPausedMenuModel();
@@ -72,7 +69,7 @@ class DownloadShelfContextMenu : public ui::SimpleMenuModel::Delegate,
   std::unique_ptr<ui::SimpleMenuModel> malicious_download_menu_model_;
 
   // Information source.
-  download::DownloadItem* download_item_;
+  DownloadUIModel* download_;
   std::unique_ptr<DownloadCommands> download_commands_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadShelfContextMenu);

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

@@ -14,8 +14,7 @@
 
 DownloadShelfContextMenuView::DownloadShelfContextMenuView(
     DownloadItemView* download_item_view)
-    // TODO(shaktisahu): Fix this. This will not work for offline item.
-    : DownloadShelfContextMenu(download_item_view->model()->download()),
+    : DownloadShelfContextMenu(download_item_view->model()),
       download_item_view_(download_item_view) {}
 
 DownloadShelfContextMenuView::~DownloadShelfContextMenuView() {}