Makes AutoclickScrollView's buttons const.

Fixes from a comment in https://chromium-review.googlesource.com/c/chromium/src/+/1659748/3/ash/system/accessibility/autoclick_scroll_view.h#63. Change-Id: I6eae86255c8fe73d3bfb00a278ac65e9b70f2669 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1665207 Reviewed-by: Tetsui Ohkubo <tetsui@chromium.org> Commit-Queue: Katie Dektar <katie@chromium.org> Cr-Commit-Position: refs/heads/master@{#670474}
Denger-Network · Jun 19, 2019 · d75eafb · d75eafb
1 parent 602404d
commit d75eafb
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/ash/system/accessibility/autoclick_scroll_view.cc b/ash/system/accessibility/autoclick_scroll_view.cc
@@ -317,25 +317,30 @@ const char* AutoclickScrollBubbleView::GetClassName() const {
 
 // ------ AutoclickScrollView  ------ //
 
-AutoclickScrollView::AutoclickScrollView() {
+AutoclickScrollView::AutoclickScrollView()
+    : scroll_up_button_(new AutoclickScrollButton(
+          AutoclickController::ScrollPadAction::kScrollUp,
+          kAutoclickScrollUpIcon,
+          IDS_ASH_AUTOCLICK_SCROLL_UP,
+          ButtonId::kScrollUp)),
+      scroll_down_button_(new AutoclickScrollButton(
+          AutoclickController::ScrollPadAction::kScrollDown,
+          kAutoclickScrollDownIcon,
+          IDS_ASH_AUTOCLICK_SCROLL_DOWN,
+          ButtonId::kScrollDown)),
+      scroll_left_button_(new AutoclickScrollButton(
+          AutoclickController::ScrollPadAction::kScrollLeft,
+          kAutoclickScrollLeftIcon,
+          IDS_ASH_AUTOCLICK_SCROLL_LEFT,
+          ButtonId::kScrollLeft)),
+      scroll_right_button_(new AutoclickScrollButton(
+          AutoclickController::ScrollPadAction::kScrollRight,
+          kAutoclickScrollRightIcon,
+          IDS_ASH_AUTOCLICK_SCROLL_RIGHT,
+          ButtonId::kScrollRight)),
+      close_scroll_button_(new AutoclickScrollCloseButton()) {
   SetPreferredSize(gfx::Size(kScrollPadButtonHypotenuseDips,
                              kScrollPadButtonHypotenuseDips));
-  scroll_up_button_ = new AutoclickScrollButton(
-      AutoclickController::ScrollPadAction::kScrollUp, kAutoclickScrollUpIcon,
-      IDS_ASH_AUTOCLICK_SCROLL_UP, ButtonId::kScrollUp);
-  scroll_down_button_ = new AutoclickScrollButton(
-      AutoclickController::ScrollPadAction::kScrollDown,
-      kAutoclickScrollDownIcon, IDS_ASH_AUTOCLICK_SCROLL_DOWN,
-      ButtonId::kScrollDown);
-  scroll_left_button_ = new AutoclickScrollButton(
-      AutoclickController::ScrollPadAction::kScrollLeft,
-      kAutoclickScrollLeftIcon, IDS_ASH_AUTOCLICK_SCROLL_LEFT,
-      ButtonId::kScrollLeft);
-  scroll_right_button_ = new AutoclickScrollButton(
-      AutoclickController::ScrollPadAction::kScrollRight,
-      kAutoclickScrollRightIcon, IDS_ASH_AUTOCLICK_SCROLL_RIGHT,
-      ButtonId::kScrollRight);
-  close_scroll_button_ = new AutoclickScrollCloseButton();
   AddChildView(close_scroll_button_);
   AddChildView(scroll_up_button_);
   AddChildView(scroll_down_button_);

diff --git a/ash/system/accessibility/autoclick_scroll_view.h b/ash/system/accessibility/autoclick_scroll_view.h
@@ -60,11 +60,11 @@ class AutoclickScrollView : public views::View {
   void Layout() override;
 
   // Unowned. Owned by views hierarchy.
-  AutoclickScrollButton* scroll_up_button_;
-  AutoclickScrollButton* scroll_down_button_;
-  AutoclickScrollButton* scroll_left_button_;
-  AutoclickScrollButton* scroll_right_button_;
-  AutoclickScrollCloseButton* close_scroll_button_;
+  AutoclickScrollButton* const scroll_up_button_;
+  AutoclickScrollButton* const scroll_down_button_;
+  AutoclickScrollButton* const scroll_left_button_;
+  AutoclickScrollButton* const scroll_right_button_;
+  AutoclickScrollCloseButton* const close_scroll_button_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoclickScrollView);
 };