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

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 15 matching lines @@
 #include "ash/common/system/ime/ime_observer.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/system/update/update_observer.h"
 #include "ash/common/system/user/user_observer.h"
 #include "ash/common/system/volume_control_delegate.h"
 #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"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
@@ skipping 400 matching lines @@
   if (LoginState::Get()->IsUserLoggedIn() &&
       !wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
     std::string page = chrome::kInternetOptionsSubPage;
     if (!guid.empty())
       page += "?guid=" + net::EscapeUrlEncodedData(guid, true);
     content::RecordAction(base::UserMetricsAction("OpenInternetOptionsDialog"));
     ShowSettingsSubPageForActiveUser(page);
   }
 }
 
+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);
 }
 
 void SystemTrayDelegateChromeOS::ShowPowerSettings() {
   if (!(switches::PowerOverlayEnabled() ||
         (ash::PowerStatus::Get()->IsBatteryPresent() &&
          ash::PowerStatus::Get()->SupportsDualRoleDevices()))) {
     return;
@@ skipping 855 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos