saved_desks: Renaming DesksTemplatesPresenter to SavedDeskPresenter.

Bug: 1322307 Change-Id: I466ee59b12dc27403ac79b712855c8562e0c522e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3638745 Reviewed-by: Sammie Quon <sammiequon@chromium.org> Commit-Queue: Daniel Andersson <dandersson@chromium.org> Cr-Commit-Position: refs/heads/main@{#1002185}
chromium · May 11, 2022 · f1673ff · f1673ff
1 parent 6ce85fc
commit f1673ff
Show file tree

Hide file tree

Showing 12 changed files with 102 additions and 107 deletions.
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
@@ -1843,8 +1843,6 @@ component("ash") {
     "wm/desks/scroll_arrow_button.h",
     "wm/desks/templates/desks_templates_metrics_util.cc",
     "wm/desks/templates/desks_templates_metrics_util.h",
-    "wm/desks/templates/desks_templates_presenter.cc",
-    "wm/desks/templates/desks_templates_presenter.h",
     "wm/desks/templates/restore_data_collector.cc",
     "wm/desks/templates/restore_data_collector.h",
     "wm/desks/templates/save_desk_template_button.cc",
@@ -1867,6 +1865,8 @@ component("ash") {
     "wm/desks/templates/saved_desk_library_view.h",
     "wm/desks/templates/saved_desk_name_view.cc",
     "wm/desks/templates/saved_desk_name_view.h",
+    "wm/desks/templates/saved_desk_presenter.cc",
+    "wm/desks/templates/saved_desk_presenter.h",
     "wm/desks/templates/saved_desk_util.cc",
     "wm/desks/templates/saved_desk_util.h",
     "wm/desks/zero_state_button.cc",

diff --git a/ash/wm/desks/desks_bar_view.cc b/ash/wm/desks/desks_bar_view.cc
@@ -30,7 +30,7 @@
 #include "ash/wm/desks/persistent_desks_bar_controller.h"
 #include "ash/wm/desks/scroll_arrow_button.h"
 #include "ash/wm/desks/templates/desks_templates_metrics_util.h"
-#include "ash/wm/desks/templates/desks_templates_presenter.h"
+#include "ash/wm/desks/templates/saved_desk_presenter.h"
 #include "ash/wm/desks/templates/saved_desk_util.h"
 #include "ash/wm/desks/zero_state_button.h"
 #include "ash/wm/overview/overview_controller.h"
@@ -219,7 +219,7 @@ class DesksBarScrollViewLayout : public views::LayoutManager {
       const bool should_show_templates_ui =
           saved_desk_util::IsSavedDesksEnabled() &&
           !bar_view_->overview_grid()->overview_session()->is_shutting_down() &&
-          DesksTemplatesPresenter::Get()->should_show_templates_ui();
+          SavedDeskPresenter::Get()->should_show_templates_ui();
       auto* zero_state_desks_templates_button =
           bar_view_->zero_state_desks_templates_button();
       const gfx::Size zero_state_desks_templates_button_size =
@@ -993,7 +993,7 @@ void DesksBarView::UpdateDesksTemplatesButtonVisibility() {
     return;
 
   const bool should_show_ui =
-      DesksTemplatesPresenter::Get()->should_show_templates_ui();
+      SavedDeskPresenter::Get()->should_show_templates_ui();
   const bool is_zero_state = IsZeroState();
 
   zero_state_desks_templates_button_->SetVisible(should_show_ui &&

diff --git a/ash/wm/desks/templates/desks_templates_test_util.cc b/ash/wm/desks/templates/desks_templates_test_util.cc
@@ -8,10 +8,10 @@
 #include "ash/style/close_button.h"
 #include "ash/wm/desks/desks_bar_view.h"
 #include "ash/wm/desks/expanded_desks_bar_button.h"
-#include "ash/wm/desks/templates/desks_templates_presenter.h"
 #include "ash/wm/desks/templates/saved_desk_dialog_controller.h"
 #include "ash/wm/desks/templates/saved_desk_item_view.h"
 #include "ash/wm/desks/templates/saved_desk_library_view.h"
+#include "ash/wm/desks/templates/saved_desk_presenter.h"
 #include "ash/wm/desks/zero_state_button.h"
 #include "ash/wm/overview/overview_grid.h"
 #include "ash/wm/overview/overview_test_util.h"
@@ -69,15 +69,15 @@ class BoundsAnimatorWaiter : public views::BoundsAnimatorObserver {
 
 }  // namespace
 
-DesksTemplatesPresenterTestApi::DesksTemplatesPresenterTestApi(
-    DesksTemplatesPresenter* presenter)
+SavedDeskPresenterTestApi::SavedDeskPresenterTestApi(
+    SavedDeskPresenter* presenter)
     : presenter_(presenter) {
   DCHECK(presenter_);
 }
 
-DesksTemplatesPresenterTestApi::~DesksTemplatesPresenterTestApi() = default;
+SavedDeskPresenterTestApi::~SavedDeskPresenterTestApi() = default;
 
-void DesksTemplatesPresenterTestApi::SetOnUpdateUiClosure(
+void SavedDeskPresenterTestApi::SetOnUpdateUiClosure(
     base::OnceClosure closure) {
   DCHECK(!presenter_->on_update_ui_closure_for_testing_);
   presenter_->on_update_ui_closure_for_testing_ = std::move(closure);
@@ -213,7 +213,7 @@ void WaitForDesksTemplatesUI() {
   DCHECK(overview_session);
 
   base::RunLoop run_loop;
-  DesksTemplatesPresenterTestApi(overview_session->desks_templates_presenter())
+  SavedDeskPresenterTestApi(overview_session->saved_desk_presenter())
       .SetOnUpdateUiClosure(run_loop.QuitClosure());
   run_loop.Run();
 }

diff --git a/ash/wm/desks/templates/desks_templates_test_util.h b/ash/wm/desks/templates/desks_templates_test_util.h
@@ -26,26 +26,26 @@ class Label;
 namespace ash {
 
 class CloseButton;
-class DesksTemplatesPresenter;
 class OverviewGrid;
 class PillButton;
 class RoundedImageView;
+class SavedDeskLibraryView;
+class SavedDeskPresenter;
 
-// Wrapper for `DesksTemplatesPresenter` that exposes internal state to test
+// Wrapper for `SavedDeskPresenter` that exposes internal state to test
 // functions.
-class DesksTemplatesPresenterTestApi {
+class SavedDeskPresenterTestApi {
  public:
-  explicit DesksTemplatesPresenterTestApi(DesksTemplatesPresenter* presenter);
-  DesksTemplatesPresenterTestApi(const DesksTemplatesPresenterTestApi&) =
+  explicit SavedDeskPresenterTestApi(SavedDeskPresenter* presenter);
+  SavedDeskPresenterTestApi(const SavedDeskPresenterTestApi&) = delete;
+  SavedDeskPresenterTestApi& operator=(const SavedDeskPresenterTestApi&) =
       delete;
-  DesksTemplatesPresenterTestApi& operator=(
-      const DesksTemplatesPresenterTestApi&) = delete;
-  ~DesksTemplatesPresenterTestApi();
+  ~SavedDeskPresenterTestApi();
 
   void SetOnUpdateUiClosure(base::OnceClosure closure);
 
  private:
-  DesksTemplatesPresenter* const presenter_;
+  SavedDeskPresenter* const presenter_;
 };
 
 // Wrapper for `SavedDeskLibraryView` that exposes internal state to test

diff --git a/ash/wm/desks/templates/desks_templates_unittest.cc b/ash/wm/desks/templates/desks_templates_unittest.cc
@@ -25,7 +25,6 @@
 #include "ash/wm/desks/desks_test_util.h"
 #include "ash/wm/desks/expanded_desks_bar_button.h"
 #include "ash/wm/desks/templates/desks_templates_metrics_util.h"
-#include "ash/wm/desks/templates/desks_templates_presenter.h"
 #include "ash/wm/desks/templates/desks_templates_test_util.h"
 #include "ash/wm/desks/templates/save_desk_template_button.h"
 #include "ash/wm/desks/templates/save_desk_template_button_container.h"
@@ -36,6 +35,7 @@
 #include "ash/wm/desks/templates/saved_desk_item_view.h"
 #include "ash/wm/desks/templates/saved_desk_library_view.h"
 #include "ash/wm/desks/templates/saved_desk_name_view.h"
+#include "ash/wm/desks/templates/saved_desk_presenter.h"
 #include "ash/wm/desks/zero_state_button.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overview/overview_constants.h"
@@ -953,10 +953,9 @@ TEST_F(DesksTemplatesTest, SaveDeskButtonsEnabledDisabled) {
   // Exit and reopen overview to delete the template.
   ToggleOverview();
   OpenOverviewAndShowTemplatesGrid();
-  const DesksTemplatesPresenter* desk_templates_presenter =
-      DesksTemplatesPresenter::Get();
-  EXPECT_EQ(desk_templates_presenter->GetMaxEntryCount(),
-            desk_templates_presenter->GetEntryCount());
+  const SavedDeskPresenter* saved_desk_presenter = SavedDeskPresenter::Get();
+  EXPECT_EQ(saved_desk_presenter->GetMaxEntryCount(),
+            saved_desk_presenter->GetEntryCount());
 
   // Verify that the button is re-enabled after we delete all templates and exit
   // the templates grid.
@@ -2921,7 +2920,7 @@ TEST_F(DesksTemplatesTest, SaveDeskRecordsWindowAndTabCountMetrics) {
   WaitForDesksTemplatesUI();
 
   // Mocks saving templates with some browsers.
-  DesksTemplatesPresenter::Get()->SaveOrUpdateDeskTemplate(
+  SavedDeskPresenter::Get()->SaveOrUpdateDeskTemplate(
       /*is_update=*/false, Shell::GetPrimaryRootWindow(),
       std::move(desk_template));
 
@@ -3501,7 +3500,7 @@ TEST_F(DesksTemplatesTest, NoDuplicateDisplayedName) {
             // `LocalDeskStorage` does not support
             // `EntriesAddedOrUpdatedRemotely`, so
             // manually call it to simluate what the real model would do.
-            DesksTemplatesPresenter::Get()->EntriesAddedOrUpdatedRemotely(
+            SavedDeskPresenter::Get()->EntriesAddedOrUpdatedRemotely(
                 {entry.get()});
             ASSERT_EQ(u"Desk 2", second_item->name_view()->GetText());
             ASSERT_EQ(u"Desk 2", second_item->desk_template()->template_name());

diff --git a/ash/wm/desks/templates/saved_desk_grid_view.cc b/ash/wm/desks/templates/saved_desk_grid_view.cc
@@ -10,10 +10,10 @@
 #include "ash/public/cpp/desk_template.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
-#include "ash/wm/desks/templates/desks_templates_presenter.h"
 #include "ash/wm/desks/templates/saved_desk_animations.h"
 #include "ash/wm/desks/templates/saved_desk_item_view.h"
 #include "ash/wm/desks/templates/saved_desk_name_view.h"
+#include "ash/wm/desks/templates/saved_desk_presenter.h"
 #include "ash/wm/overview/overview_controller.h"
 #include "ash/wm/overview/overview_highlight_controller.h"
 #include "ash/wm/overview/overview_session.h"

diff --git a/ash/wm/desks/templates/saved_desk_item_view.cc b/ash/wm/desks/templates/saved_desk_item_view.cc
@@ -20,12 +20,12 @@
 #include "ash/wm/desks/desk.h"
 #include "ash/wm/desks/desks_textfield.h"
 #include "ash/wm/desks/templates/desks_templates_metrics_util.h"
-#include "ash/wm/desks/templates/desks_templates_presenter.h"
 #include "ash/wm/desks/templates/saved_desk_dialog_controller.h"
 #include "ash/wm/desks/templates/saved_desk_grid_view.h"
 #include "ash/wm/desks/templates/saved_desk_icon_container.h"
 #include "ash/wm/desks/templates/saved_desk_library_view.h"
 #include "ash/wm/desks/templates/saved_desk_name_view.h"
+#include "ash/wm/desks/templates/saved_desk_presenter.h"
 #include "ash/wm/overview/overview_constants.h"
 #include "ash/wm/overview/overview_controller.h"
 #include "ash/wm/overview/overview_grid.h"
@@ -301,7 +301,7 @@ void SavedDeskItemView::MaybeRemoveNameNumber() {
 void SavedDeskItemView::ReplaceTemplate(const std::string& uuid) {
   // Make sure we delete the template we are replacing first, so that we don't
   // get template name collisions.
-  DesksTemplatesPresenter::Get()->DeleteEntry(uuid);
+  SavedDeskPresenter::Get()->DeleteEntry(uuid);
   UpdateTemplateName();
   RecordReplaceTemplateHistogram();
 }
@@ -505,7 +505,7 @@ void SavedDeskItemView::UpdateTemplateName() {
   desk_template_->set_template_name(name_view_->GetText());
   OnTemplateNameChanged(desk_template_->template_name());
 
-  DesksTemplatesPresenter::Get()->SaveOrUpdateDeskTemplate(
+  SavedDeskPresenter::Get()->SaveOrUpdateDeskTemplate(
       /*is_update=*/true, GetWidget()->GetNativeWindow()->GetRootWindow(),
       desk_template_->Clone());
 }
@@ -631,7 +631,7 @@ SavedDeskItemView* SavedDeskItemView::FindOtherTemplateWithName(
 }
 
 void SavedDeskItemView::OnDeleteTemplate() {
-  DesksTemplatesPresenter::Get()->DeleteEntry(
+  SavedDeskPresenter::Get()->DeleteEntry(
       desk_template_->uuid().AsLowercaseString());
 }
 
@@ -664,7 +664,7 @@ void SavedDeskItemView::MaybeLaunchTemplate(bool should_delay) {
     delay = base::Seconds(3);
 #endif
 
-  DesksTemplatesPresenter::Get()->LaunchDeskTemplate(
+  SavedDeskPresenter::Get()->LaunchDeskTemplate(
       desk_template_->uuid().AsLowercaseString(), delay,
       GetWidget()->GetNativeWindow()->GetRootWindow());
 }