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

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

Issue 2064953002: mash: Migrate tray date view to //ash/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayviews
Patch Set: review feedback Created 4 years, 6 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 3a2afbc43eb1f5b19d0e6499eaa0cc90f06059d1..3250b0bb1739cb15597bd0aecb384b010e819f66 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -16,6 +16,7 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/session/session_state_observer.h"
#include "ash/common/shell_window_ids.h"
+#include "ash/common/system/date/clock_observer.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/wm_system_tray_notifier.h"
#include "ash/common/system/update/update_observer.h"
@@ -29,7 +30,6 @@
#include "ash/system/chromeos/power/power_status.h"
#include "ash/system/chromeos/session/logout_button_observer.h"
#include "ash/system/chromeos/shutdown_policy_observer.h"
-#include "ash/system/date/clock_observer.h"
#include "ash/system/ime/ime_observer.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_notifier.h"
@@ -618,6 +618,10 @@ void SystemTrayDelegateChromeOS::RequestRestartForUpdate() {
chrome::NotifyAndTerminate(true /* fast path */);
}
+void SystemTrayDelegateChromeOS::RequestShutdown() {
+ ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown();
+}
+
void SystemTrayDelegateChromeOS::GetAvailableBluetoothDevices(
ash::BluetoothDeviceList* list) {
device::BluetoothAdapter::DeviceList devices =
@@ -968,7 +972,7 @@ void SystemTrayDelegateChromeOS::OnSystemClockChanged(
system::SystemClock* system_clock) {
const bool use_24_hour_clock = system_clock->ShouldUse24HourClock();
clock_type_ = use_24_hour_clock ? base::k24HourClock : base::k12HourClock;
- GetSystemTrayNotifier()->NotifyDateFormatChanged();
+ GetWmSystemTrayNotifier()->NotifyDateFormatChanged();
}
void SystemTrayDelegateChromeOS::UpdateShowLogoutButtonInTray() {
« 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