Revert "ash: Show calendar events in CalendarDateCellView"

This reverts commit 279a629.

Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1258843

Original change's description:
> ash: Show calendar events in CalendarDateCellView
>
> Fetch events and store them by month and day in
> CalendarViewController.
>
> Each day displays a dot if it contains any events.
>
> Add unit tests.
>
> Bug: 1238927
> Change-Id: Ia1837797ff62b34e8a89fed508e9545704974048
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3179301
> Commit-Queue: Roger Tinkoff <[email protected]>
> Reviewed-by: Alex Newcomer <[email protected]>
> Reviewed-by: Boris Sazonov <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#930155}

Bug: 1238927
Change-Id: Ie686aca72c53f81a475b167b4b712a599eb0085d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3218030
Bot-Commit: Rubber Stamper <[email protected]>
Owners-Override: Taylor Bergquist <[email protected]>
Auto-Submit: Taylor Bergquist <[email protected]>
Commit-Queue: Taylor Bergquist <[email protected]>
Cr-Commit-Position: refs/heads/main@{#930232}

Author: Taylor Bergquist

ash/BUILD.gn

@@ -1919,7 +1919,6 @@ component("ash") {
     "//chromeos/ui/vector_icons",
     "//components/discardable_memory/public/mojom",
     "//google_apis/calendar",
-    "//google_apis/common",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
     "//services/data_decoder/public/mojom",
@@ -2698,7 +2697,6 @@ test("ash_unittests") {
     "//device/bluetooth",
     "//device/bluetooth:mocks",
     "//extensions/common:common_constants",
-    "//google_apis/calendar",
     "//mojo/core/embedder",
     "//mojo/public/cpp/bindings",
     "//net:net",

ash/system/time/DEPS

@@ -27,10 +27,6 @@ constexpr int kLineThickness = 2;
 // The radius used to draw rounded today's circle
 constexpr float kTodayRoundedRadius = 20.f;
 
-// Radius of the small dot we display on a CalendarDateCellView if events are
-// present for that day.
-constexpr float kEventsPresentRoundedRadius = 2.f;
-
 // The padding of the focus circle.
 constexpr int kFocusCirclePadding = 4;
 
@@ -50,10 +46,8 @@ using views::GridLayout;
 
 // TODO(https://crbug.com/1236276): Fix the ChromeVox window position on this
 // view.
-CalendarDateCellView::CalendarDateCellView(
-    CalendarViewController* calendar_view_controller,
-    base::Time::Exploded& date,
-    bool is_grayed_out_date)
+CalendarDateCellView::CalendarDateCellView(base::Time::Exploded& date,
+                                           bool is_grayed_out_date)
     : views::LabelButton(
           views::Button::PressedCallback(base::BindRepeating([]() {
             // TODO(https://crbug.com/1238927): Add a menthod in the
@@ -62,8 +56,7 @@ CalendarDateCellView::CalendarDateCellView(
           base::UTF8ToUTF16(base::NumberToString(date.day_of_month)),
           CONTEXT_CALENDAR_DATE),
       date_(date),
-      grayed_out_(is_grayed_out_date),
-      calendar_view_controller_(calendar_view_controller) {
+      grayed_out_(is_grayed_out_date) {
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
   SetBorder(views::CreateEmptyBorder(calendar_utils::kDateCellInsets));
   label()->SetElideBehavior(gfx::NO_ELIDE);
@@ -154,35 +147,6 @@ void CalendarDateCellView::DisableFocus() {
   SetFocusBehavior(FocusBehavior::NEVER);
 }
 
-gfx::Point CalendarDateCellView::GetEventsPresentIndicatorCenterPosition() {
-  const gfx::Rect content = GetContentsBounds();
-  return gfx::Point(
-      (content.width() + calendar_utils::kDateHorizontalPadding * 2) / 2,
-      (content.height() + calendar_utils::kDateVerticalPadding * 2) / 2 +
-          calendar_utils::kDateVerticalPadding);
-}
-
-void CalendarDateCellView::MaybeDrawEventsIndicator(gfx::Canvas* canvas) {
-  base::Time unexploded;
-  DCHECK(base::Time::FromUTCExploded(date_, &unexploded));
-
-  if (!calendar_view_controller_->IsDayWithEvents(unexploded,
-                                                  /*events =*/nullptr)) {
-    return;
-  }
-
-  cc::PaintFlags indicator_paint_flags;
-  indicator_paint_flags.setColor(calendar_utils::GetPrimaryTextColor());
-  indicator_paint_flags.setStyle(cc::PaintFlags::kFill_Style);
-  canvas->DrawCircle(GetEventsPresentIndicatorCenterPosition(),
-                     kEventsPresentRoundedRadius, indicator_paint_flags);
-}
-
-void CalendarDateCellView::PaintButtonContents(gfx::Canvas* canvas) {
-  views::LabelButton::PaintButtonContents(canvas);
-  MaybeDrawEventsIndicator(canvas);
-}
-
 CalendarMonthView::CalendarMonthView(
     const base::Time first_day_of_month,
     CalendarViewController* calendar_view_controller)
@@ -267,7 +231,7 @@ CalendarDateCellView* CalendarMonthView::AddDateCellToLayout(
   if (column_set_id == 0)
     layout_manager->StartRow(0, 0);
   return layout_manager->AddView(std::make_unique<CalendarDateCellView>(
-      calendar_view_controller_, current_date_exploded,
+      current_date_exploded,
       /*is_grayed_out_date=*/!is_in_current_month));
 }
 

ash/system/time/calendar_month_view.cc

@@ -19,9 +19,7 @@ class CalendarDateCellView : public views::LabelButton {
  public:
   METADATA_HEADER(CalendarDateCellView);
 
-  CalendarDateCellView(CalendarViewController* calendar_view_controller,
-                       base::Time::Exploded& date,
-                       bool is_grayed_out_date);
+  CalendarDateCellView(base::Time::Exploded& date, bool is_grayed_out_date);
   CalendarDateCellView(const CalendarDateCellView& other) = delete;
   CalendarDateCellView& operator=(const CalendarDateCellView& other) = delete;
   ~CalendarDateCellView() override;
@@ -39,24 +37,11 @@ class CalendarDateCellView : public views::LabelButton {
   // Disables focus behavior of this cell.
   void DisableFocus();
 
- protected:
-  // views::Button:
-  void PaintButtonContents(gfx::Canvas* canvas) override;
-
  private:
-  // Computes the position of the indicator that our day has events.
-  gfx::Point GetEventsPresentIndicatorCenterPosition();
-
-  // Draw the indicator if our day has events.
-  void MaybeDrawEventsIndicator(gfx::Canvas* canvas);
-
   // The date used to render this cell view.
   const base::Time::Exploded date_;
 
   const bool grayed_out_;
-
-  // Owned by UnifiedCalendarViewController.
-  const CalendarViewController* const calendar_view_controller_;
 };
 
 //  Container for `CalendarDateCellView` for a single month.

ash/system/time/calendar_month_view.h

@@ -40,10 +40,6 @@ constexpr gfx::Insets kContentInsets{kContentVerticalPadding};
 // bottom if there's this much pixel left.
 constexpr int kPrepareEndOfView = 30;
 
-// After the user is finished navigating to a different month, this is how long
-// we wait before fetchiung more events.
-constexpr base::TimeDelta kScrollingSettledTimeout = base::Milliseconds(100);
-
 // TODO(https://crbug.com/1236276): for some language it may start from "M".
 constexpr int kDefaultWeekTitles[] = {
     IDS_ASH_CALENDAR_SUN, IDS_ASH_CALENDAR_MON, IDS_ASH_CALENDAR_TUE,
@@ -124,15 +120,15 @@ class CalendarView::MonthYearHeaderView : public views::View {
       : month_label_(AddChildView(std::make_unique<views::Label>())) {
     switch (type) {
       case PREVIOUS:
-        date_ = calendar_view_controller->GetPreviousMonthFirstDay(1);
+        date_ = calendar_view_controller->GetPreviousMonthFirstDay();
         month_name_ = calendar_view_controller->GetPreviousMonthName();
         break;
       case CURRENT:
         date_ = calendar_view_controller->GetOnScreenMonthFirstDay();
         month_name_ = calendar_view_controller->GetOnScreenMonthName();
         break;
       case NEXT:
-        date_ = calendar_view_controller->GetNextMonthFirstDay(1);
+        date_ = calendar_view_controller->GetNextMonthFirstDay();
         month_name_ = calendar_view_controller->GetNextMonthName();
         break;
     }
@@ -192,12 +188,7 @@ CalendarView::CalendarView(DetailedViewDelegate* delegate,
                            CalendarViewController* calendar_view_controller)
     : TrayDetailedView(delegate),
       controller_(controller),
-      calendar_view_controller_(calendar_view_controller),
-      scrolling_settled_timer_(
-          FROM_HERE,
-          kScrollingSettledTimeout,
-          base::BindRepeating(&CalendarView::OnScrollingSettledTimerFired,
-                              base::Unretained(this))) {
+      calendar_view_controller_(calendar_view_controller) {
   CreateTitleRow(IDS_ASH_CALENDAR_TITLE);
 
   // Add the header.
@@ -272,10 +263,6 @@ CalendarView::CalendarView(DetailedViewDelegate* delegate,
 
 CalendarView::~CalendarView() = default;
 
-void CalendarView::Init() {
-  calendar_view_controller_->FetchEvents();
-}
-
 void CalendarView::CreateExtraTitleRowButtons() {
   DCHECK(!reset_to_today_button_);
   tri_view()->SetContainerVisible(TriView::Container::END, /*visible=*/true);
@@ -309,14 +296,14 @@ views::Button* CalendarView::CreateInfoButton(
 void CalendarView::SetMonthViews() {
   previous_label_ = AddLabelWithId(LabelType::PREVIOUS);
   previous_month_ =
-      AddMonth(calendar_view_controller_->GetPreviousMonthFirstDay(1));
+      AddMonth(calendar_view_controller_->GetPreviousMonthFirstDay());
 
   current_label_ = AddLabelWithId(LabelType::CURRENT);
   current_month_ =
       AddMonth(calendar_view_controller_->GetOnScreenMonthFirstDay());
 
   next_label_ = AddLabelWithId(LabelType::NEXT);
-  next_month_ = AddMonth(calendar_view_controller_->GetNextMonthFirstDay(1));
+  next_month_ = AddMonth(calendar_view_controller_->GetNextMonthFirstDay());
 }
 
 int CalendarView::PositionOfCurrentMonth() {
@@ -498,20 +485,11 @@ void CalendarView::OnMonthChanged(const base::Time::Exploded current_month) {
 
   header_->SetText(calendar_view_controller_->GetOnScreenMonthName());
   header_year_->SetText(year_string);
-
-  scrolling_settled_timer_.Reset();
-}
-
-void CalendarView::OnEventsFetched(
-    const google_apis::calendar::EventList* events) {
-  // No need to store the events, but we need to notify the month views that
-  // something may have changed and they need to refresh.
-  SchedulePaint();
 }
 
 void CalendarView::ScrollUpOneMonth() {
   calendar_view_controller_->UpdateMonth(
-      calendar_view_controller_->GetPreviousMonthFirstDay(1));
+      calendar_view_controller_->GetPreviousMonthFirstDay());
   content_view_->RemoveChildViewT(next_label_);
   content_view_->RemoveChildViewT(next_month_);
 
@@ -521,7 +499,7 @@ void CalendarView::ScrollUpOneMonth() {
   current_month_ = previous_month_;
 
   previous_month_ =
-      AddMonth(calendar_view_controller_->GetPreviousMonthFirstDay(1),
+      AddMonth(calendar_view_controller_->GetPreviousMonthFirstDay(),
                /*add_at_front=*/true);
   if (IsDateCellViewFocused())
     previous_month_->EnableFocus();
@@ -550,7 +528,7 @@ void CalendarView::ScrollDownOneMonth() {
                        previous_label_->GetPreferredSize().height();
 
   calendar_view_controller_->UpdateMonth(
-      calendar_view_controller_->GetNextMonthFirstDay(1));
+      calendar_view_controller_->GetNextMonthFirstDay());
 
   content_view_->RemoveChildViewT(previous_label_);
   content_view_->RemoveChildViewT(previous_month_);
@@ -561,7 +539,7 @@ void CalendarView::ScrollDownOneMonth() {
   current_month_ = next_month_;
 
   next_label_ = AddLabelWithId(LabelType::NEXT);
-  next_month_ = AddMonth(calendar_view_controller_->GetNextMonthFirstDay(1));
+  next_month_ = AddMonth(calendar_view_controller_->GetNextMonthFirstDay());
   if (IsDateCellViewFocused())
     next_month_->EnableFocus();
 
@@ -696,10 +674,6 @@ void CalendarView::OnEvent(ui::Event* event) {
   }
 }
 
-void CalendarView::OnScrollingSettledTimerFired() {
-  calendar_view_controller_->FetchEvents();
-}
-
 BEGIN_METADATA(CalendarView, views::View)
 END_METADATA
 

ash/system/time/calendar_view.cc

@@ -10,7 +10,6 @@
 #include "ash/system/tray/tray_detailed_view.h"
 #include "ash/system/unified/unified_system_tray_controller.h"
 #include "base/scoped_multi_source_observation.h"
-#include "base/timer/timer.h"
 #include "ui/base/metadata/metadata_header_macros.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/view.h"
@@ -40,14 +39,11 @@ class ASH_EXPORT CalendarView : public CalendarViewController::Observer,
   CalendarView& operator=(const CalendarView& other) = delete;
   ~CalendarView() override;
 
-  void Init();
-
   // views::ScrollView::Observer:
   void OnContentsScrolled() override;
 
   // CalendarViewController::Observer:
   void OnMonthChanged(const base::Time::Exploded current_month) override;
-  void OnEventsFetched(const google_apis::calendar::EventList* events) override;
 
   // views::ViewObserver:
   void OnViewBoundsChanged(views::View* observed_view) override;
@@ -118,9 +114,6 @@ class ASH_EXPORT CalendarView : public CalendarViewController::Observer,
   // today's button), resets the content view's `FocusBehavior` to `ALWAYS`.
   void MaybeResetContentViewFocusBehavior();
 
-  // We only fetch events after we've "settled" on the current on-screen month.
-  void OnScrollingSettledTimerFired();
-
   // Unowned.
   UnifiedSystemTrayController* controller_;
 
@@ -148,10 +141,6 @@ class ASH_EXPORT CalendarView : public CalendarViewController::Observer,
   // don't need to check if we need to update the month or not.
   bool is_resetting_scroll_ = false;
 
-  // Timer that fires when we've "settled" on, i.e. finished scrolling to, a
-  // currently-visible month
-  base::RetainingOneShotTimer scrolling_settled_timer_;
-
   base::ScopedObservation<views::ScrollView,
                           views::ScrollView::Observer,
                           &views::ScrollView::AddScrollViewObserver,