mash: Create system tray display and rotation lock items via delegate

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 "ash/common/ash_switches.h"
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 179 matching lines @@
   AddTrayItem(new TrayIME(this));
   AddTrayItem(tray_accessibility_);
   AddTrayItem(new TrayTracing(this));
   AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get()));
   AddTrayItem(new TrayNetwork(this));
   AddTrayItem(new TrayVPN(this));
   AddTrayItem(new TraySms(this));
   AddTrayItem(new TrayBluetooth(this));
   tray_cast_ = new TrayCast(this);
   AddTrayItem(tray_cast_);
-  AddTrayItem(new TrayDisplay(this));
+  std::unique_ptr<SystemTrayItem> tray_display =

[msw, 2016/07/13 18:51:49]

optional nit: add a comment?

[James Cook, 2016/07/13 21:30:46]

Done.

+      delegate->CreateDisplayTrayItem(this);
+  if (tray_display)
+    AddTrayItem(tray_display.release());
   screen_capture_tray_item_ = new ScreenCaptureTrayItem(this);
   AddTrayItem(screen_capture_tray_item_);
   screen_share_tray_item_ = new ScreenShareTrayItem(this);
   AddTrayItem(screen_share_tray_item_);
   AddTrayItem(new MultiProfileMediaTrayItem(this));
   AddTrayItem(new TrayAudioChromeOs(this));
   AddTrayItem(new TrayBrightness(this));
   AddTrayItem(new TrayCapsLock(this));
   AddTrayItem(new TrayRotationLock(this));
   AddTrayItem(new TraySettings(this));
@@ skipping 15 matching lines @@
   views::View* tray_item = item->CreateTrayView(delegate->GetUserLoginStatus());
   item->UpdateAfterShelfAlignmentChange(shelf_alignment());
 
   if (tray_item) {
     tray_container()->AddChildViewAt(tray_item, 0);
     PreferredSizeChanged();
     tray_item_map_[item] = tray_item;
   }
 }
 
-void SystemTray::RemoveTrayItem(SystemTrayItem* item) {
-  NOTIMPLEMENTED();
-}
-
 const std::vector<SystemTrayItem*>& SystemTray::GetTrayItems() const {
   return items_.get();
 }
 
 void SystemTray::ShowDefaultView(BubbleCreationType creation_type) {
   ShowDefaultViewWithOffset(
       creation_type, TrayBubbleView::InitParams::kArrowDefaultOffset, false);
 }
 
 void SystemTray::ShowPersistentDefaultView() {
@@ skipping 513 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