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

Unified Diff: ash/mus/system_tray_delegate_mus.cc

Issue 2373863002: mustash: Connect ash system tray "show settings" items to chrome over mojo (Closed)
Patch Set: Created 4 years, 3 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
Index: ash/mus/system_tray_delegate_mus.cc
diff --git a/ash/mus/system_tray_delegate_mus.cc b/ash/mus/system_tray_delegate_mus.cc
index f2afff5527e22ea33723c2f96543ae0273b0415b..0257bd8ae052f48790eab4627c675c02893c9650 100644
--- a/ash/mus/system_tray_delegate_mus.cc
+++ b/ash/mus/system_tray_delegate_mus.cc
@@ -51,15 +51,92 @@ void SystemTrayDelegateMus::OnClientConnectionError() {
system_tray_client_.reset();
}
+////////////////////////////////////////////////////////////////////////////////
+// SystemTrayDelegate:
+
base::HourClockType SystemTrayDelegateMus::GetHourClockType() const {
return hour_clock_type_;
}
+void SystemTrayDelegateMus::ShowSettings() {
+ ConnectToSystemTrayClient();
msw 2016/09/27 20:14:33 optional nit: make ConnectToSystemTrayClient retur
James Cook 2016/09/27 20:48:59 Done. I kept the name ConnectToSystemTrayClient()
+ system_tray_client_->ShowSettings();
msw 2016/09/27 20:14:34 nice! looking forward to using this myself
+}
+
void SystemTrayDelegateMus::ShowDateSettings() {
ConnectToSystemTrayClient();
system_tray_client_->ShowDateSettings();
}
+void SystemTrayDelegateMus::ShowNetworkSettingsForGuid(
+ const std::string& guid) {
+ // http://crbug.com/647412
+ NOTIMPLEMENTED();
+}
+
+void SystemTrayDelegateMus::ShowDisplaySettings() {
+ ConnectToSystemTrayClient();
+ system_tray_client_->ShowDisplaySettings();
+}
+
+void SystemTrayDelegateMus::ShowPowerSettings() {
+ // http://crbug.com/647412
+ NOTIMPLEMENTED();
+}
+
+void SystemTrayDelegateMus::ShowChromeSlow() {
+ ConnectToSystemTrayClient();
+ system_tray_client_->ShowChromeSlow();
+}
+
+void SystemTrayDelegateMus::ShowIMESettings() {
+ ConnectToSystemTrayClient();
+ system_tray_client_->ShowIMESettings();
+}
+
+void SystemTrayDelegateMus::ShowHelp() {
+ ConnectToSystemTrayClient();
+ system_tray_client_->ShowHelp();
+}
+
+void SystemTrayDelegateMus::ShowAccessibilityHelp() {
+ ConnectToSystemTrayClient();
+ system_tray_client_->ShowAccessibilityHelp();
+}
+
+void SystemTrayDelegateMus::ShowAccessibilitySettings() {
+ ConnectToSystemTrayClient();
+ system_tray_client_->ShowAccessibilitySettings();
+}
+
+void SystemTrayDelegateMus::ShowPaletteHelp() {
+ ConnectToSystemTrayClient();
+ system_tray_client_->ShowPaletteHelp();
+}
+
+void SystemTrayDelegateMus::ShowPaletteSettings() {
+ ConnectToSystemTrayClient();
+ system_tray_client_->ShowPaletteSettings();
+}
+
+void SystemTrayDelegateMus::ShowPublicAccountInfo() {
+ ConnectToSystemTrayClient();
+ system_tray_client_->ShowPublicAccountInfo();
+}
+
+void SystemTrayDelegateMus::ShowEnterpriseInfo() {
+ // http://crbug.com/647412
+ NOTIMPLEMENTED();
+}
+
+void SystemTrayDelegateMus::ShowProxySettings() {
+ ConnectToSystemTrayClient();
+ system_tray_client_->ShowProxySettings();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// mojom::SystemTray:
+
void SystemTrayDelegateMus::SetUse24HourClock(bool use_24_hour) {
hour_clock_type_ = use_24_hour ? base::k24HourClock : base::k12HourClock;
WmShell::Get()->system_tray_notifier()->NotifyDateFormatChanged();

Powered by Google App Engine
This is Rietveld 408576698