| OLD | NEW |
| 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 Loading... |
| 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 |
| 97 void SystemTrayController::ShowNetworkSettings(const std::string& network_id) { | 103 void SystemTrayController::ShowNetworkSettings(const std::string& network_id) { |
| 98 if (ConnectToSystemTrayClient()) | 104 if (ConnectToSystemTrayClient()) |
| 99 system_tray_client_->ShowNetworkSettings(network_id); | 105 system_tray_client_->ShowNetworkSettings(network_id); |
| 100 } | 106 } |
| 101 | 107 |
| 102 void SystemTrayController::ShowProxySettings() { | 108 void SystemTrayController::ShowProxySettings() { |
| 103 if (ConnectToSystemTrayClient()) | 109 if (ConnectToSystemTrayClient()) |
| 104 system_tray_client_->ShowProxySettings(); | 110 system_tray_client_->ShowProxySettings(); |
| 105 } | 111 } |
| 106 | 112 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 void SystemTrayController::OnClientConnectionError() { | 152 void SystemTrayController::OnClientConnectionError() { |
| 147 system_tray_client_.reset(); | 153 system_tray_client_.reset(); |
| 148 } | 154 } |
| 149 | 155 |
| 150 void SystemTrayController::SetUse24HourClock(bool use_24_hour) { | 156 void SystemTrayController::SetUse24HourClock(bool use_24_hour) { |
| 151 hour_clock_type_ = use_24_hour ? base::k24HourClock : base::k12HourClock; | 157 hour_clock_type_ = use_24_hour ? base::k24HourClock : base::k12HourClock; |
| 152 WmShell::Get()->system_tray_notifier()->NotifyDateFormatChanged(); | 158 WmShell::Get()->system_tray_notifier()->NotifyDateFormatChanged(); |
| 153 } | 159 } |
| 154 | 160 |
| 155 } // namespace ash | 161 } // namespace ash |
| OLD | NEW |