scanner: Remove command delegate from action view model class

The command delegate used for all actions is effectively a per-session
singleton in the controller, so storing a reference to it in the action
view model is redundant.

The command delegate in the session is now unused. It will be removed in
https://crrev.com/c/6182423.

Bug: b:390305029
Change-Id: I6a6a21003c7ef5a16abc40a8f24ef858e9a7c2cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6174827
Reviewed-by: Jon Htin <[email protected]>
Commit-Queue: Michael Cui <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1408508}

Author: mlcui-corp

ash/scanner/scanner_action_view_model.cc

@@ -8,11 +8,9 @@
 #include <utility>
 
 #include "ash/resources/vector_icons/vector_icons.h"
-#include "ash/scanner/scanner_command_delegate.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_refptr.h"
-#include "base/memory/weak_ptr.h"
 #include "base/notreached.h"
 #include "chromeos/ui/vector_icons/vector_icons.h"
 #include "components/manta/proto/scanner.pb.h"
@@ -22,11 +20,9 @@ namespace ash {
 
 ScannerActionViewModel::ScannerActionViewModel(
     manta::proto::ScannerAction unpopulated_action,
-    scoped_refptr<base::RefCountedMemory> downscaled_jpeg_bytes,
-    base::WeakPtr<ScannerCommandDelegate> delegate)
+    scoped_refptr<base::RefCountedMemory> downscaled_jpeg_bytes)
     : unpopulated_action_(std::move(unpopulated_action)),
-      downscaled_jpeg_bytes_(std::move(downscaled_jpeg_bytes)),
-      delegate_(std::move(delegate)) {}
+      downscaled_jpeg_bytes_(std::move(downscaled_jpeg_bytes)) {}
 
 ScannerActionViewModel::ScannerActionViewModel(const ScannerActionViewModel&) =
     default;

ash/scanner/scanner_action_view_model.h

@@ -11,7 +11,6 @@
 #include "base/functional/callback_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_refptr.h"
-#include "base/memory/weak_ptr.h"
 #include "components/manta/proto/scanner.pb.h"
 
 namespace gfx {
@@ -20,16 +19,13 @@ struct VectorIcon;
 
 namespace ash {
 
-class ScannerCommandDelegate;
-
 // A view model wrapper around a `ScannerUnpopulatedAction`, which handles the
 // conversion to a user-facing text string, icon, and a callback.
 class ASH_EXPORT ScannerActionViewModel {
  public:
   explicit ScannerActionViewModel(
       manta::proto::ScannerAction unpopulated_action,
-      scoped_refptr<base::RefCountedMemory> downscaled_jpeg_bytes,
-      base::WeakPtr<ScannerCommandDelegate> delegate);
+      scoped_refptr<base::RefCountedMemory> downscaled_jpeg_bytes);
   ScannerActionViewModel(const ScannerActionViewModel&);
   ScannerActionViewModel& operator=(const ScannerActionViewModel&);
   ScannerActionViewModel(ScannerActionViewModel&&);
@@ -48,12 +44,10 @@ class ASH_EXPORT ScannerActionViewModel {
   const scoped_refptr<base::RefCountedMemory>& downscaled_jpeg_bytes() const {
     return downscaled_jpeg_bytes_;
   }
-  base::WeakPtr<ScannerCommandDelegate> delegate() const { return delegate_; }
 
  private:
   manta::proto::ScannerAction unpopulated_action_;
   scoped_refptr<base::RefCountedMemory> downscaled_jpeg_bytes_;
-  base::WeakPtr<ScannerCommandDelegate> delegate_;
 };
 
 }  // namespace ash

ash/scanner/scanner_controller.cc

@@ -315,14 +315,19 @@ void ScannerController::ExecuteAction(
   if (!scanner_session_) {
     return;
   }
+  // During an active user session, the first successful `StartNewSession()`
+  // call will create both the session and the command delegate. The command
+  // delegate is never reset afterwards, so the command delegate should always
+  // exist here.
+  CHECK(command_delegate_);
   const manta::proto::ScannerAction::ActionCase action_case =
       scanner_action.GetActionCase();
   scanner_session_->PopulateAction(
       scanner_action.downscaled_jpeg_bytes(),
       scanner_action.unpopulated_action(),
       base::BindOnce(
           &ExecutePopulatedAction, action_case, base::TimeTicks::Now(),
-          scanner_action.delegate(),
+          command_delegate_->GetWeakPtr(),
           base::BindOnce(&ScannerController::OnActionFinished,
                          weak_ptr_factory_.GetWeakPtr(), action_case)));
   ShowActionProgressNotification(action_case);

ash/scanner/scanner_session.cc

@@ -215,8 +215,7 @@ void ScannerSession::OnActionsReturned(
     if (proto_action.action_case() !=
         manta::proto::ScannerAction::ACTION_NOT_SET) {
       action_view_models.emplace_back(std::move(proto_action),
-                                      downscaled_jpeg_bytes,
-                                      command_delegate_->GetWeakPtr());
+                                      downscaled_jpeg_bytes);
     }
   }