MD cros - Fix padding in system tray

ash/common/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/common/system/tray/system_tray.h"
 
 #include "ash/common/key_event_watcher.h"
 #include "ash/common/login_status.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 56 matching lines @@
 #include "ash/common/system/chromeos/tray_caps_lock.h"
 #include "ash/common/system/chromeos/tray_tracing.h"
 #include "ash/common/system/ime/tray_ime_chromeos.h"
 #include "ui/message_center/message_center.h"
 #endif
 
 using views::TrayBubbleView;
 
 namespace ash {
 
+namespace {
+
+// A tray item that just reserves space in the tray.
+class PaddingTrayItem : public SystemTrayItem {
+ public:
+  PaddingTrayItem() : SystemTrayItem(nullptr, UMA_NOT_RECORDED) {}
+  ~PaddingTrayItem() override {}
+
+  // Overridden from SystemTrayItem.

[tdanderson, 2016/10/31 21:29:09]

nit: just "SystemTrayItem:"

[Evan Stade, 2016/10/31 22:11:56]

I will make this change, but don't want to switch to this patch's branch at the
moment

[tdanderson, 2016/11/01 00:00:35]

Acknowledged.

+  views::View* CreateTrayView(LoginStatus status) override {
+    return new PaddingView();
+  }
+
+ private:
+  class PaddingView : public views::View {
+   public:
+    PaddingView() {}
+    ~PaddingView() override {}
+
+   private:
+    gfx::Size GetPreferredSize() const override {
+      return gfx::Size(GetTrayConstant(TRAY_IMAGE_ITEM_PADDING),
+                       GetTrayConstant(TRAY_IMAGE_ITEM_PADDING));
+    }
+
+    DISALLOW_COPY_AND_ASSIGN(PaddingView);
+  };
+
+  DISALLOW_COPY_AND_ASSIGN(PaddingTrayItem);
+};
+
+}  // namespace
+
 // The minimum width of the system tray menu.
 const int kMinimumSystemTrayMenuWidth = 300;
 const int kMinimumSystemTrayMenuWidthMd = 332;
 
 // Class to initialize and manage the SystemTrayBubble and TrayBubbleWrapper
 // instances for a bubble.
 
 class SystemBubbleWrapper {
  public:
   // Takes ownership of |bubble|.
@@ skipping 88 matching lines @@
       hide_notifications_(false),
       full_system_tray_menu_(false),
       tray_accessibility_(nullptr),
       tray_audio_(nullptr),
       tray_cast_(nullptr),
       tray_date_(nullptr),
       tray_update_(nullptr),
       screen_capture_tray_item_(nullptr),
       screen_share_tray_item_(nullptr) {
   SetContentsBackground();
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    tray_container()->SetMargin(GetTrayConstant(TRAY_IMAGE_ITEM_PADDING), 0);
 }
 
 SystemTray::~SystemTray() {
   // Destroy any child views that might have back pointers before ~View().
   activation_observer_.reset();
   key_event_watcher_.reset();
   system_bubble_.reset();
   notification_bubble_.reset();
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
        it != items_.end(); ++it) {
@@ skipping 17 matching lines @@
 
 void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
 #if !defined(OS_WIN)
   // Create user items for each possible user.
   int maximum_user_profiles = WmShell::Get()
                                   ->GetSessionStateDelegate()
                                   ->GetMaximumNumberOfLoggedInUsers();
   for (int i = 0; i < maximum_user_profiles; i++)
     AddTrayItem(new TrayUser(this, i));
 
+  // Crucially, this trailing padding has to be inside the user item(s).
+  // Otherwise it could be a main axis margin on the tray's box layout.
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+    AddTrayItem(new PaddingTrayItem());
+
   if (maximum_user_profiles > 1) {
     // Add a special double line separator between users and the rest of the
     // menu if more than one user is logged in.
     AddTrayItem(new TrayUserSeparator(this));
   }
 #endif
 
   tray_accessibility_ = new TrayAccessibility(this);
   tray_date_ = new TrayDate(this);
   tray_update_ = new TrayUpdate(this);
@@ skipping 31 matching lines @@
   AddTrayItem(tray_update_);
   if (MaterialDesignController::IsSystemTrayMenuMaterial())
     AddTrayItem(new TrayTiles(this));
   // TODO(tdanderson): Do not add |tray_date_| in material design.
   AddTrayItem(tray_date_);
 #elif defined(OS_WIN)
   AddTrayItem(tray_accessibility_);
   AddTrayItem(tray_update_);
   AddTrayItem(tray_date_);
 #endif
+  // Leading padding.
+  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+    AddTrayItem(new PaddingTrayItem());
 }
 
 void SystemTray::AddTrayItem(SystemTrayItem* item) {
   items_.push_back(item);
 
   SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
   views::View* tray_item = item->CreateTrayView(delegate->GetUserLoginStatus());
   item->UpdateAfterShelfAlignmentChange(shelf_alignment());
 
   if (tray_item) {
@@ skipping 606 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