More pre-MD cleanup

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 <algorithm>
 #include <map>
 #include <vector>
 
 #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_controller.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/chromeos/audio/tray_audio.h"
 #include "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"
 #include "ash/common/system/chromeos/brightness/tray_brightness.h"
 #include "ash/common/system/chromeos/cast/tray_cast.h"
 #include "ash/common/system/chromeos/enterprise/tray_enterprise.h"
 #include "ash/common/system/chromeos/media_security/multi_profile_media_tray_item.h"
 #include "ash/common/system/chromeos/network/tray_network.h"
 #include "ash/common/system/chromeos/network/tray_vpn.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/common/system/chromeos/power/tray_power.h"
 #include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h"
 #include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h"
 #include "ash/common/system/chromeos/session/tray_session_length_limit.h"
 #include "ash/common/system/chromeos/supervised/tray_supervised_user.h"
 #include "ash/common/system/chromeos/tray_caps_lock.h"
 #include "ash/common/system/chromeos/tray_tracing.h"
-#include "ash/common/system/date/tray_date.h"
 #include "ash/common/system/date/tray_system_info.h"
 #include "ash/common/system/ime/tray_ime_chromeos.h"
 #include "ash/common/system/tiles/tray_tiles.h"
 #include "ash/common/system/tray/system_tray_controller.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_accessibility.h"
 #include "ash/common/system/update/tray_update.h"
@@ skipping 170 matching lines @@
 
 SystemTray::SystemTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf, true),
       web_notification_tray_(nullptr),
       detailed_item_(nullptr),
       default_bubble_height_(0),
       full_system_tray_menu_(false),
       tray_accessibility_(nullptr),
       tray_audio_(nullptr),
       tray_cast_(nullptr),
-      tray_date_(nullptr),
       tray_network_(nullptr),
       tray_tiles_(nullptr),
       tray_system_info_(nullptr),
       tray_update_(nullptr),
       screen_capture_tray_item_(nullptr),
       screen_share_tray_item_(nullptr) {
-  if (MaterialDesignController::IsShelfMaterial()) {
-    SetInkDropMode(InkDropMode::ON);
+  SetInkDropMode(InkDropMode::ON);
 
-    // Since user avatar is on the right hand side of System tray of a
-    // horizontal shelf and that is sufficient to indicate separation, no
-    // separator is required.
-    set_separator_visibility(false);
-  }
+  // Since user avatar is on the right hand side of System tray of a
+  // horizontal shelf and that is sufficient to indicate separation, no
+  // separator is required.
+  set_separator_visibility(false);
 }
 
 SystemTray::~SystemTray() {
   // Destroy any child views that might have back pointers before ~View().
   activation_observer_.reset();
   key_event_watcher_.reset();
   system_bubble_.reset();
   for (const auto& item : items_)
     item->DestroyTrayView();
 }
 
 void SystemTray::InitializeTrayItems(
     SystemTrayDelegate* delegate,
     WebNotificationTray* web_notification_tray) {
   DCHECK(web_notification_tray);
   web_notification_tray_ = web_notification_tray;
   TrayBackgroundView::Initialize();
   CreateItems(delegate);
 }
 
 void SystemTray::Shutdown() {
   DCHECK(web_notification_tray_);
   web_notification_tray_ = nullptr;
 }
 
 void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
-  const bool use_md = MaterialDesignController::IsSystemTrayMenuMaterial();
-
   // Create user items for each possible user.
   const int maximum_user_profiles =
       Shell::Get()->session_controller()->GetMaximumNumberOfLoggedInUsers();
   for (int i = 0; i < maximum_user_profiles; i++)
     AddTrayItem(base::MakeUnique<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.
   AddTrayItem(base::MakeUnique<PaddingTrayItem>());
 
   tray_accessibility_ = new TrayAccessibility(this);
-  if (!use_md)
-    tray_date_ = new TrayDate(this);
   tray_update_ = new TrayUpdate(this);
 
   AddTrayItem(base::MakeUnique<TraySessionLengthLimit>(this));
   AddTrayItem(base::MakeUnique<TrayEnterprise>(this));
   AddTrayItem(base::MakeUnique<TraySupervisedUser>(this));
   AddTrayItem(base::MakeUnique<TrayIME>(this));
   AddTrayItem(base::WrapUnique(tray_accessibility_));
   AddTrayItem(base::MakeUnique<TrayTracing>(this));
   AddTrayItem(
       base::MakeUnique<TrayPower>(this, message_center::MessageCenter::Get()));
@@ skipping 12 matching lines @@
   AddTrayItem(base::WrapUnique(tray_audio_));
   AddTrayItem(base::MakeUnique<TrayBrightness>(this));
   AddTrayItem(base::MakeUnique<TrayCapsLock>(this));
   // TODO(jamescook): Remove this when mus has support for display management
   // and we have a DisplayManager equivalent. See http://crbug.com/548429
   std::unique_ptr<SystemTrayItem> tray_rotation_lock =
       delegate->CreateRotationLockTrayItem(this);
   if (tray_rotation_lock)
     AddTrayItem(std::move(tray_rotation_lock));
   AddTrayItem(base::WrapUnique(tray_update_));
-  if (use_md) {
-    tray_tiles_ = new TrayTiles(this);
-    AddTrayItem(base::WrapUnique(tray_tiles_));
-    tray_system_info_ = new TraySystemInfo(this);
-    AddTrayItem(base::WrapUnique(tray_system_info_));
-    // Leading padding.
-    AddTrayItem(base::MakeUnique<PaddingTrayItem>());
-  } else {
-    AddTrayItem(base::WrapUnique(tray_date_));
-  }
+  tray_tiles_ = new TrayTiles(this);
+  AddTrayItem(base::WrapUnique(tray_tiles_));
+  tray_system_info_ = new TraySystemInfo(this);
+  AddTrayItem(base::WrapUnique(tray_system_info_));
+  // Leading padding.
+  AddTrayItem(base::MakeUnique<PaddingTrayItem>());
 }
 
 void SystemTray::AddTrayItem(std::unique_ptr<SystemTrayItem> item) {
   SystemTrayItem* item_ptr = item.get();
   items_.push_back(std::move(item));
 
   SystemTrayDelegate* delegate = Shell::Get()->system_tray_delegate();
   views::View* tray_item =
       item_ptr->CreateTrayView(delegate->GetUserLoginStatus());
   item_ptr->UpdateAfterShelfAlignmentChange(shelf_alignment());
@@ skipping 101 matching lines @@
 
 bool SystemTray::CloseSystemBubble() const {
   if (!system_bubble_)
     return false;
   CHECK(!activating_);
   system_bubble_->bubble()->Close();
   return true;
 }
 
 views::View* SystemTray::GetHelpButtonView() const {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    return tray_tiles_->GetHelpButtonView();
-  return tray_date_->GetHelpButtonView();
+  return tray_tiles_->GetHelpButtonView();
 }
 
 TrayAudio* SystemTray::GetTrayAudio() const {
   return tray_audio_;
 }
 
 // Private methods.
 
 bool SystemTray::HasSystemBubbleType(SystemTrayBubble::BubbleType type) {
   return system_bubble_.get() && system_bubble_->bubble_type() == type;
@@ skipping 44 matching lines @@
     // destruction, leading to subtle errors/crashes such as crbug.com/545166.
     DestroySystemBubble();
 
     // Remember if the menu is a single property (like e.g. volume) or the
     // full tray menu. Note that in case of the |BUBBLE_USE_EXISTING| case
     // above, |full_system_tray_menu_| does not get changed since the fact that
     // the menu is full (or not) doesn't change even if a "single property"
     // (like network) replaces most of the menu.
     full_system_tray_menu_ = items.size() > 1;
 
-    // The menu width is fixed for all languages in material design.
-    int menu_width = kTrayMenuMinimumWidthMd;
-    if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      // The menu width is fixed, and it is a per language setting.
-      menu_width = std::max(
-          kTrayMenuMinimumWidth,
-          Shell::Get()->system_tray_delegate()->GetSystemTrayMenuWidth());
-    }
-
-    TrayBubbleView::InitParams init_params(GetAnchorAlignment(), menu_width,
-                                           kTrayPopupMaxWidth);
+    TrayBubbleView::InitParams init_params(
+        GetAnchorAlignment(), kTrayMenuMinimumWidthMd, kTrayPopupMaxWidth);
     // TODO(oshima): Change TrayBubbleView itself.
     init_params.can_activate = false;
     if (detailed) {
       // This is the case where a volume control or brightness control bubble
       // is created.
       init_params.max_height = default_bubble_height_;
       init_params.bg_color = kBackgroundColor;
     } else {
       init_params.bg_color = kHeaderBackgroundColor;
     }
@@ skipping 134 matching lines @@
 views::View* SystemTray::GetTrayItemViewForTest(SystemTrayItem* item) {
   std::map<SystemTrayItem*, views::View*>::iterator it =
       tray_item_map_.find(item);
   return it == tray_item_map_.end() ? NULL : it->second;
 }
 
 TrayCast* SystemTray::GetTrayCastForTesting() const {
   return tray_cast_;
 }
 
-TrayDate* SystemTray::GetTrayDateForTesting() const {
-  return tray_date_;
-}
-
 TrayNetwork* SystemTray::GetTrayNetworkForTesting() const {
   return tray_network_;
 }
 
 TraySystemInfo* SystemTray::GetTraySystemInfoForTesting() const {
   return tray_system_info_;
 }
 
 TrayTiles* SystemTray::GetTrayTilesForTesting() const {
   return tray_tiles_;
@@ skipping 88 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