Apply View::set_preferred_size in some more places.

ash/system/tray/system_tray.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/tray/system_tray.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 70 matching lines @@
 namespace {
 
 // A tray item that just reserves space in the tray.
 class PaddingTrayItem : public SystemTrayItem {
  public:
   PaddingTrayItem() : SystemTrayItem(nullptr, UMA_NOT_RECORDED) {}
   ~PaddingTrayItem() override {}
 
   // SystemTrayItem:
   views::View* CreateTrayView(LoginStatus status) override {
-    return new PaddingView();
+    auto* padding = new views::View();
+    // The other tray items already have some padding baked in so we have to
+    // subtract that off.
+    constexpr int side = kTrayEdgePadding - kTrayImageItemPadding;
+    padding->set_preferred_size(gfx::Size(side, side));
+    return padding;
   }
 
  private:
-  class PaddingView : public views::View {
-   public:
-    PaddingView() {}
-    ~PaddingView() override {}
-
-   private:
-    gfx::Size GetPreferredSize() const override {
-      // The other tray items already have some padding baked in so we have to
-      // subtract that off.
-      const int side = kTrayEdgePadding - kTrayImageItemPadding;
-      return gfx::Size(side, side);
-    }
-
-    DISALLOW_COPY_AND_ASSIGN(PaddingView);
-  };
-
   DISALLOW_COPY_AND_ASSIGN(PaddingTrayItem);
 };
 
 }  // namespace
 
 // Class to initialize and manage the SystemTrayBubble and TrayBubbleWrapper
 // instances for a bubble.
 
 class SystemBubbleWrapper {
  public:
@@ skipping 601 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash