Rename models in sub-controllers.

Sub-controller own a single model so it is overly verbose to prefix.

Bug: b:112084674
Change-Id: I49dfaed84d12bd0c4abe30bf7f20e15945ac6660
Reviewed-on: https://chromium-review.googlesource.com/1226270
Commit-Queue: David Black <dmblack@google.com>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#591250}

ash/assistant/assistant_interaction_controller.h

@@ -46,9 +46,7 @@ class AssistantInteractionController
   void SetAssistant(chromeos::assistant::mojom::Assistant* assistant);
 
   // Returns a reference to the underlying model.
-  const AssistantInteractionModel* model() const {
-    return &assistant_interaction_model_;
-  }
+  const AssistantInteractionModel* model() const { return &model_; }
 
   // Adds/removes the specified interaction model |observer|.
   void AddModelObserver(AssistantInteractionModelObserver* observer);
@@ -117,7 +115,7 @@ class AssistantInteractionController
   mojo::Binding<chromeos::assistant::mojom::AssistantInteractionSubscriber>
       assistant_interaction_subscriber_binding_;
 
-  AssistantInteractionModel assistant_interaction_model_;
+  AssistantInteractionModel model_;
 
   DISALLOW_COPY_AND_ASSIGN(AssistantInteractionController);
 };

ash/assistant/assistant_screen_context_controller.cc

@@ -144,12 +144,12 @@ void AssistantScreenContextController::SetAssistant(
 
 void AssistantScreenContextController::AddModelObserver(
     AssistantScreenContextModelObserver* observer) {
-  assistant_screen_context_model_.AddObserver(observer);
+  model_.AddObserver(observer);
 }
 
 void AssistantScreenContextController::RemoveModelObserver(
     AssistantScreenContextModelObserver* observer) {
-  assistant_screen_context_model_.RemoveObserver(observer);
+  model_.RemoveObserver(observer);
 }
 
 void AssistantScreenContextController::RequestScreenshot(
@@ -195,8 +195,7 @@ void AssistantScreenContextController::OnUiVisibilityChanged(
   // Otherwise, we abort any requests in progress and reset state.
   if (new_visibility != AssistantVisibility::kVisible) {
     screen_context_request_factory_.InvalidateWeakPtrs();
-    assistant_screen_context_model_.SetRequestState(
-        ScreenContextRequestState::kIdle);
+    model_.SetRequestState(ScreenContextRequestState::kIdle);
     return;
   }
 
@@ -210,8 +209,7 @@ void AssistantScreenContextController::OnUiVisibilityChanged(
 
   // Abort any request in progress and update request state.
   screen_context_request_factory_.InvalidateWeakPtrs();
-  assistant_screen_context_model_.SetRequestState(
-      ScreenContextRequestState::kInProgress);
+  model_.SetRequestState(ScreenContextRequestState::kInProgress);
 
   // Cache screen context for the entire screen.
   assistant_->CacheScreenContext(base::BindOnce(
@@ -220,8 +218,7 @@ void AssistantScreenContextController::OnUiVisibilityChanged(
 }
 
 void AssistantScreenContextController::OnScreenContextRequestFinished() {
-  assistant_screen_context_model_.SetRequestState(
-      ScreenContextRequestState::kIdle);
+  model_.SetRequestState(ScreenContextRequestState::kIdle);
 }
 
 std::unique_ptr<ui::LayerTreeOwner>

ash/assistant/assistant_screen_context_controller.h

@@ -36,9 +36,7 @@ class ASH_EXPORT AssistantScreenContextController
   void SetAssistant(chromeos::assistant::mojom::Assistant* assistant);
 
   // Returns a reference to the underlying model.
-  const AssistantScreenContextModel* model() const {
-    return &assistant_screen_context_model_;
-  }
+  const AssistantScreenContextModel* model() const { return &model_; }
 
   // Adds/removes the specified screen context model |observer|.
   void AddModelObserver(AssistantScreenContextModelObserver* observer);
@@ -71,7 +69,7 @@ class ASH_EXPORT AssistantScreenContextController
   // Owned by AssistantController.
   chromeos::assistant::mojom::Assistant* assistant_ = nullptr;
 
-  AssistantScreenContextModel assistant_screen_context_model_;
+  AssistantScreenContextModel model_;
 
   // Weak pointer factory used for screen context requests.
   base::WeakPtrFactory<AssistantScreenContextController>

ash/assistant/assistant_ui_controller.cc

@@ -62,12 +62,12 @@ void AssistantUiController::SetAssistant(
 
 void AssistantUiController::AddModelObserver(
     AssistantUiModelObserver* observer) {
-  assistant_ui_model_.AddObserver(observer);
+  model_.AddObserver(observer);
 }
 
 void AssistantUiController::RemoveModelObserver(
     AssistantUiModelObserver* observer) {
-  assistant_ui_model_.RemoveObserver(observer);
+  model_.RemoveObserver(observer);
 }
 
 void AssistantUiController::OnWidgetActivationChanged(views::Widget* widget,
@@ -90,8 +90,8 @@ void AssistantUiController::OnWidgetDestroying(views::Widget* widget) {
   // We need to update the model when the widget is destroyed as this may have
   // happened outside our control. This can occur as the result of pressing the
   // ESC key, for example.
-  assistant_ui_model_.SetVisibility(AssistantVisibility::kClosed,
-                                    AssistantSource::kUnspecified);
+  model_.SetVisibility(AssistantVisibility::kClosed,
+                       AssistantSource::kUnspecified);
 
   container_view_->GetWidget()->RemoveObserver(this);
   container_view_ = nullptr;
@@ -123,7 +123,7 @@ void AssistantUiController::OnMicStateChanged(MicState mic_state) {
 
 void AssistantUiController::OnScreenContextRequestStateChanged(
     ScreenContextRequestState request_state) {
-  if (assistant_ui_model_.visibility() != AssistantVisibility::kVisible)
+  if (model_.visibility() != AssistantVisibility::kVisible)
     return;
 
   // Once screen context request state has become idle, it is safe to activate
@@ -172,11 +172,11 @@ void AssistantUiController::OnHighlighterEnabledChanged(
     HighlighterEnabledState state) {
   switch (state) {
     case HighlighterEnabledState::kEnabled:
-      if (assistant_ui_model_.visibility() != AssistantVisibility::kVisible)
+      if (model_.visibility() != AssistantVisibility::kVisible)
         ShowUi(AssistantSource::kStylus);
       break;
     case HighlighterEnabledState::kDisabledByUser:
-      if (assistant_ui_model_.visibility() == AssistantVisibility::kVisible)
+      if (model_.visibility() == AssistantVisibility::kVisible)
         HideUi(AssistantSource::kStylus);
       break;
     case HighlighterEnabledState::kDisabledBySessionComplete:
@@ -214,7 +214,7 @@ void AssistantUiController::OnDeepLinkReceived(
 
 void AssistantUiController::OnUrlOpened(const GURL& url) {
   // We hide Assistant UI when opening a URL in a new tab.
-  if (assistant_ui_model_.visibility() == AssistantVisibility::kVisible)
+  if (model_.visibility() == AssistantVisibility::kVisible)
     HideUi(AssistantSource::kUnspecified);
 }
 
@@ -260,7 +260,7 @@ void AssistantUiController::ShowUi(AssistantSource source) {
     return;
   }
 
-  if (assistant_ui_model_.visibility() == AssistantVisibility::kVisible) {
+  if (model_.visibility() == AssistantVisibility::kVisible) {
     // If Assistant window is already visible, we just try to retake focus.
     container_view_->GetWidget()->Activate();
     return;
@@ -275,24 +275,24 @@ void AssistantUiController::ShowUi(AssistantSource source) {
   // necessary due to limitations imposed by retrieving screen context. Once we
   // have finished retrieving screen context, the Assistant widget is activated.
   container_view_->GetWidget()->ShowInactive();
-  assistant_ui_model_.SetVisibility(AssistantVisibility::kVisible, source);
+  model_.SetVisibility(AssistantVisibility::kVisible, source);
 }
 
 void AssistantUiController::HideUi(AssistantSource source) {
-  if (assistant_ui_model_.visibility() == AssistantVisibility::kHidden)
+  if (model_.visibility() == AssistantVisibility::kHidden)
     return;
 
   if (container_view_)
     container_view_->GetWidget()->Hide();
 
-  assistant_ui_model_.SetVisibility(AssistantVisibility::kHidden, source);
+  model_.SetVisibility(AssistantVisibility::kHidden, source);
 }
 
 void AssistantUiController::CloseUi(AssistantSource source) {
-  if (assistant_ui_model_.visibility() == AssistantVisibility::kClosed)
+  if (model_.visibility() == AssistantVisibility::kClosed)
     return;
 
-  assistant_ui_model_.SetVisibility(AssistantVisibility::kClosed, source);
+  model_.SetVisibility(AssistantVisibility::kClosed, source);
 
   if (container_view_) {
     container_view_->GetWidget()->CloseNow();
@@ -302,13 +302,13 @@ void AssistantUiController::CloseUi(AssistantSource source) {
 
 void AssistantUiController::ToggleUi(AssistantSource source) {
   // When not visible, toggling will show the UI.
-  if (assistant_ui_model_.visibility() != AssistantVisibility::kVisible) {
+  if (model_.visibility() != AssistantVisibility::kVisible) {
     ShowUi(source);
     return;
   }
 
   // When in mini state, toggling will restore the main UI.
-  if (assistant_ui_model_.ui_mode() == AssistantUiMode::kMiniUi) {
+  if (model_.ui_mode() == AssistantUiMode::kMiniUi) {
     UpdateUiMode(AssistantUiMode::kMainUi);
     return;
   }
@@ -322,7 +322,7 @@ void AssistantUiController::UpdateUiMode(
   // If a UI mode is provided, we will use it in lieu of updating UI mode on the
   // basis of interaction/widget visibility state.
   if (ui_mode.has_value()) {
-    assistant_ui_model_.SetUiMode(ui_mode.value());
+    model_.SetUiMode(ui_mode.value());
     return;
   }
 
@@ -332,9 +332,9 @@ void AssistantUiController::UpdateUiMode(
 
   // When stylus input modality is selected, we should be in mini UI mode.
   // Otherwise we fall back to main UI mode.
-  assistant_ui_model_.SetUiMode(input_modality == InputModality::kStylus
-                                    ? AssistantUiMode::kMiniUi
-                                    : AssistantUiMode::kMainUi);
+  model_.SetUiMode(input_modality == InputModality::kStylus
+                       ? AssistantUiMode::kMiniUi
+                       : AssistantUiMode::kMainUi);
 }
 
 AssistantContainerView* AssistantUiController::GetViewForTest() {

ash/assistant/assistant_ui_controller.h

@@ -57,7 +57,7 @@ class ASH_EXPORT AssistantUiController
   void SetAssistant(chromeos::assistant::mojom::Assistant* assistant);
 
   // Returns the underlying model.
-  const AssistantUiModel* model() const { return &assistant_ui_model_; }
+  const AssistantUiModel* model() const { return &model_; }
 
   // Adds/removes the specified model |observer|.
   void AddModelObserver(AssistantUiModelObserver* observer);
@@ -119,7 +119,7 @@ class ASH_EXPORT AssistantUiController
   // Owned by AssistantController.
   chromeos::assistant::mojom::Assistant* assistant_ = nullptr;
 
-  AssistantUiModel assistant_ui_model_;
+  AssistantUiModel model_;
 
   AssistantContainerView* container_view_ =
       nullptr;  // Owned by view hierarchy.