Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1198)

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2148943002: mash: Create system tray display and rotation lock items via delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments, add rotation lock Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..4dce95b19e0c8dcfdd27302abef7d3881ecaaff9 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -33,6 +33,8 @@
#include "ash/common/wm_shell.h"
#include "ash/desktop_background/desktop_background_controller.h"
#include "ash/shell.h"
+#include "ash/system/chromeos/rotation/tray_rotation_lock.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"
@@ -850,6 +852,16 @@ ash::VPNDelegate* SystemTrayDelegateChromeOS::GetVPNDelegate() const {
return vpn_delegate_.get();
}
+std::unique_ptr<ash::SystemTrayItem>
+SystemTrayDelegateChromeOS::CreateDisplayTrayItem(ash::SystemTray* tray) {
+ return base::MakeUnique<ash::TrayDisplay>(tray);
+}
+
+std::unique_ptr<ash::SystemTrayItem>
+SystemTrayDelegateChromeOS::CreateRotationLockTrayItem(ash::SystemTray* tray) {
+ return base::MakeUnique<ash::TrayRotationLock>(tray);
+}
+
void SystemTrayDelegateChromeOS::UserAddedToSession(
const user_manager::User* active_user) {
}
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698