Remove pre-MD code from SystemTrayBubble.

ash/common/system/tray/system_tray_bubble.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_bubble.h"
 
 #include <utility>
 #include <vector>
 
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_bubble_wrapper.h"
 #include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/system/tray/tray_popup_item_container.h"
 #include "ash/common/wm_shell.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
@@ skipping 261 matching lines @@
        tray_item_view_map_) {
     if (pair.second->visible() &&
         pair.first != SystemTrayItem::UMA_NOT_RECORDED) {
       UMA_HISTOGRAM_ENUMERATION("Ash.SystemMenu.DefaultView.VisibleRows",
                                 pair.first, SystemTrayItem::UMA_COUNT);
     }
   }
 }
 
 void SystemTrayBubble::UpdateBottomPadding() {
-  if (bubble_type_ == BUBBLE_TYPE_DEFAULT &&
-      MaterialDesignController::IsSystemTrayMenuMaterial()) {
+  if (bubble_type_ == BUBBLE_TYPE_DEFAULT)
     bubble_view_->SetBottomPadding(kDefaultViewBottomPadding);
-  } else {
+  else
     bubble_view_->SetBottomPadding(0);
-  }
 }
 
 void SystemTrayBubble::CreateItemViews(LoginStatus login_status) {
   tray_item_view_map_.clear();
 
   // If a system modal dialog is present, create the same tray as
   // in locked state.
   if (WmShell::Get()->IsSystemModalWindowOpen() &&
       login_status != LoginStatus::NOT_LOGGED_IN) {
     login_status = LoginStatus::LOCKED;
   }
 
-  std::vector<TrayPopupItemContainer*> item_containers;
   views::View* focus_view = nullptr;
-  const bool is_default_bubble = bubble_type_ == BUBBLE_TYPE_DEFAULT;
   for (size_t i = 0; i < items_.size(); ++i) {
     views::View* item_view = nullptr;
     switch (bubble_type_) {
       case BUBBLE_TYPE_DEFAULT:
         item_view = items_[i]->CreateDefaultView(login_status);
         if (items_[i]->restore_focus())
           focus_view = item_view;
         break;
       case BUBBLE_TYPE_DETAILED:
         item_view = items_[i]->CreateDetailedView(login_status);
         break;
     }
     if (item_view) {
-      TrayPopupItemContainer* tray_popup_item_container =
-          new TrayPopupItemContainer(
-              item_view,
-              is_default_bubble &&
-                  !MaterialDesignController::IsSystemTrayMenuMaterial());
-      bubble_view_->AddChildView(tray_popup_item_container);
-      item_containers.push_back(tray_popup_item_container);
-      tray_item_view_map_[items_[i]->uma_type()] = tray_popup_item_container;
+      bubble_view_->AddChildView(item_view);
+      tray_item_view_map_[items_[i]->uma_type()] = item_view;
     }
   }
 
-  if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    // For default view, draw bottom border for each item, except the last
-    // 2 items, which are the bottom header row and the one just above it.
-    if (is_default_bubble) {
-      const int last_item_with_border =
-          static_cast<int>(item_containers.size()) - 2;
-      for (int i = 0; i < last_item_with_border; ++i) {
-        item_containers.at(i)->SetBorder(
-            views::CreateSolidSidedBorder(0, 0, 1, 0, kBorderLightColor));
-      }
-    }
-  }
-
   if (focus_view) {
     tray_->ActivateBubble();
     focus_view->RequestFocus();
   }
 }
 
 }  // namespace ash