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

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index 1ba70edb392be3f5ab9605b464811595407a4abe..ecae64aa98901d2dc75b7611158abd2b5fdd47ef 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -33,6 +33,7 @@
 #include "ash/common/wm_shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
+#include "ash/system/chromeos/tray_display.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/wm/lock_state_controller.h"
 #include "base/bind_helpers.h"
@@ -453,6 +454,11 @@ void SystemTrayDelegateChromeOS::ShowNetworkSettingsForGuid(
   }
 }
 
+std::unique_ptr<ash::SystemTrayItem>
+SystemTrayDelegateChromeOS::CreateDisplayTrayItem(ash::SystemTray* tray) {
+  return base::WrapUnique(new ash::TrayDisplay(tray));

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

nit: MakeUnique

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

Done.

+}
+
 void SystemTrayDelegateChromeOS::ShowDisplaySettings() {
   content::RecordAction(base::UserMetricsAction("ShowDisplayOptions"));
   ShowSettingsSubPageForActiveUser(kDisplaySettingsSubPageName);