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

Side by Side Diff: ash/common/system/tray/system_tray_controller.cc

Issue 2522613004: Revert of chromeos: Convert ash VPNDelegate interface to mojo (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/common/system/tray/system_tray_controller.h" 5 #include "ash/common/system/tray/system_tray_controller.h"
6 6
7 #include "ash/common/system/tray/system_tray_notifier.h" 7 #include "ash/common/system/tray/system_tray_notifier.h"
8 #include "ash/common/wm_shell.h" 8 #include "ash/common/wm_shell.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 void SystemTrayController::ShowNetworkConfigure(const std::string& network_id) { 87 void SystemTrayController::ShowNetworkConfigure(const std::string& network_id) {
88 if (ConnectToSystemTrayClient()) 88 if (ConnectToSystemTrayClient())
89 system_tray_client_->ShowNetworkConfigure(network_id); 89 system_tray_client_->ShowNetworkConfigure(network_id);
90 } 90 }
91 91
92 void SystemTrayController::ShowNetworkCreate(const std::string& type) { 92 void SystemTrayController::ShowNetworkCreate(const std::string& type) {
93 if (ConnectToSystemTrayClient()) 93 if (ConnectToSystemTrayClient())
94 system_tray_client_->ShowNetworkCreate(type); 94 system_tray_client_->ShowNetworkCreate(type);
95 } 95 }
96 96
97 void SystemTrayController::ShowThirdPartyVpnCreate(
98 const std::string& extension_id) {
99 if (ConnectToSystemTrayClient())
100 system_tray_client_->ShowThirdPartyVpnCreate(extension_id);
101 }
102
103 void SystemTrayController::ShowNetworkSettings(const std::string& network_id) { 97 void SystemTrayController::ShowNetworkSettings(const std::string& network_id) {
104 if (ConnectToSystemTrayClient()) 98 if (ConnectToSystemTrayClient())
105 system_tray_client_->ShowNetworkSettings(network_id); 99 system_tray_client_->ShowNetworkSettings(network_id);
106 } 100 }
107 101
108 void SystemTrayController::ShowProxySettings() { 102 void SystemTrayController::ShowProxySettings() {
109 if (ConnectToSystemTrayClient()) 103 if (ConnectToSystemTrayClient())
110 system_tray_client_->ShowProxySettings(); 104 system_tray_client_->ShowProxySettings();
111 } 105 }
112 106
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 void SystemTrayController::OnClientConnectionError() { 146 void SystemTrayController::OnClientConnectionError() {
153 system_tray_client_.reset(); 147 system_tray_client_.reset();
154 } 148 }
155 149
156 void SystemTrayController::SetUse24HourClock(bool use_24_hour) { 150 void SystemTrayController::SetUse24HourClock(bool use_24_hour) {
157 hour_clock_type_ = use_24_hour ? base::k24HourClock : base::k12HourClock; 151 hour_clock_type_ = use_24_hour ? base::k24HourClock : base::k12HourClock;
158 WmShell::Get()->system_tray_notifier()->NotifyDateFormatChanged(); 152 WmShell::Get()->system_tray_notifier()->NotifyDateFormatChanged();
159 } 153 }
160 154
161 } // namespace ash 155 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_controller.h ('k') | ash/common/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698