assistant: Remove unused screen context model observer

Bug: b/145218971
Test: manual
Change-Id: Idbafcf175286ebbd933cd1228931fe511e74bc5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2070114Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Tao Wu <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744082}

ash/assistant/assistant_screen_context_controller.cc

@@ -180,16 +180,6 @@ void AssistantScreenContextController::SetAssistant(
   assistant_ = assistant;
 }
 
-void AssistantScreenContextController::AddModelObserver(
-    AssistantScreenContextModelObserver* observer) {
-  model_.AddObserver(observer);
-}
-
-void AssistantScreenContextController::RemoveModelObserver(
-    AssistantScreenContextModelObserver* observer) {
-  model_.RemoveObserver(observer);
-}
-
 void AssistantScreenContextController::RequestScreenshot(
     const gfx::Rect& rect,
     mojom::AssistantScreenContextController::RequestScreenshotCallback
@@ -235,23 +225,15 @@ void AssistantScreenContextController::OnUiVisibilityChanged(
   // Otherwise, we abort any requests in progress and reset state.
   if (new_visibility != AssistantVisibility::kVisible) {
     screen_context_request_factory_.InvalidateWeakPtrs();
-    model_.SetRequestState(ScreenContextRequestState::kIdle);
     assistant_->ClearScreenContextCache();
     return;
   }
 
   // Abort any request in progress and update request state.
   screen_context_request_factory_.InvalidateWeakPtrs();
-  model_.SetRequestState(ScreenContextRequestState::kInProgress);
 
   // Cache screen context for the entire screen.
-  assistant_->CacheScreenContext(base::BindOnce(
-      &AssistantScreenContextController::OnScreenContextRequestFinished,
-      screen_context_request_factory_.GetWeakPtr()));
-}
-
-void AssistantScreenContextController::OnScreenContextRequestFinished() {
-  model_.SetRequestState(ScreenContextRequestState::kIdle);
+  assistant_->CacheScreenContext(base::BindOnce([]() {}));
 }
 
 std::unique_ptr<ui::LayerTreeOwner>

ash/assistant/assistant_screen_context_controller.h

@@ -25,7 +25,6 @@ class LayerTreeOwner;
 namespace ash {
 
 class AssistantController;
-class AssistantScreenContextModelObserver;
 
 class ASH_EXPORT AssistantScreenContextController
     : public mojom::AssistantScreenContextController,
@@ -45,10 +44,6 @@ class ASH_EXPORT AssistantScreenContextController
   // Returns a reference to the underlying model.
   const AssistantScreenContextModel* model() const { return &model_; }
 
-  // Adds/removes the specified screen context model |observer|.
-  void AddModelObserver(AssistantScreenContextModelObserver* observer);
-  void RemoveModelObserver(AssistantScreenContextModelObserver* observer);
-
   // ash::mojom::AssistantScreenContextController:
   void RequestScreenshot(
       const gfx::Rect& rect,
@@ -66,9 +61,6 @@ class ASH_EXPORT AssistantScreenContextController
       base::Optional<AssistantEntryPoint> entry_point,
       base::Optional<AssistantExitPoint> exit_point) override;
 
-  // Invoked on screen context request finished event.
-  void OnScreenContextRequestFinished();
-
   std::unique_ptr<ui::LayerTreeOwner> CreateLayerForAssistantSnapshotForTest();
 
  private:

ash/assistant/model/assistant_screen_context_model.cc

@@ -4,36 +4,10 @@
 
 #include "ash/assistant/model/assistant_screen_context_model.h"
 
-#include "ash/assistant/model/assistant_screen_context_model_observer.h"
-
 namespace ash {
 
 AssistantScreenContextModel::AssistantScreenContextModel() = default;
 
 AssistantScreenContextModel::~AssistantScreenContextModel() = default;
 
-void AssistantScreenContextModel::AddObserver(
-    AssistantScreenContextModelObserver* observer) {
-  observers_.AddObserver(observer);
-}
-
-void AssistantScreenContextModel::RemoveObserver(
-    AssistantScreenContextModelObserver* observer) {
-  observers_.RemoveObserver(observer);
-}
-
-void AssistantScreenContextModel::SetRequestState(
-    ScreenContextRequestState request_state) {
-  if (request_state == request_state_)
-    return;
-
-  request_state_ = request_state;
-  NotifyRequestStateChanged();
-}
-
-void AssistantScreenContextModel::NotifyRequestStateChanged() {
-  for (AssistantScreenContextModelObserver& observer : observers_)
-    observer.OnScreenContextRequestStateChanged(request_state_);
-}
-
 }  // namespace ash

ash/assistant/model/assistant_screen_context_model.h

@@ -7,37 +7,15 @@
 
 #include "base/component_export.h"
 #include "base/macros.h"
-#include "base/observer_list.h"
 
 namespace ash {
 
-class AssistantScreenContextModelObserver;
-
-// Enumeration of screen context request states.
-enum class ScreenContextRequestState {
-  kIdle,
-  kInProgress,
-};
-
 class COMPONENT_EXPORT(ASSISTANT_MODEL) AssistantScreenContextModel {
  public:
   AssistantScreenContextModel();
   ~AssistantScreenContextModel();
 
-  // Adds/removes the specified screen context model |observer|.
-  void AddObserver(AssistantScreenContextModelObserver* observer);
-  void RemoveObserver(AssistantScreenContextModelObserver* observer);
-
-  // Sets the screen context request state.
-  void SetRequestState(ScreenContextRequestState request_state);
-
  private:
-  void NotifyRequestStateChanged();
-
-  ScreenContextRequestState request_state_ = ScreenContextRequestState::kIdle;
-
-  base::ObserverList<AssistantScreenContextModelObserver> observers_;
-
   DISALLOW_COPY_AND_ASSIGN(AssistantScreenContextModel);
 };