| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/ui/ash/system_tray_delegate_common.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_common.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/shell_delegate.h" | 8 #include "ash/shell_delegate.h" |
| 9 #include "ash/system/tray/system_tray.h" | 9 #include "ash/system/tray/system_tray.h" |
| 10 #include "ash/system/tray/system_tray_notifier.h" | 10 #include "ash/system/tray/system_tray_notifier.h" |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 void SystemTrayDelegateCommon::GetCurrentIMEProperties( | 204 void SystemTrayDelegateCommon::GetCurrentIMEProperties( |
| 205 ash::IMEPropertyInfoList* list) { | 205 ash::IMEPropertyInfoList* list) { |
| 206 } | 206 } |
| 207 | 207 |
| 208 void SystemTrayDelegateCommon::SwitchIME(const std::string& ime_id) { | 208 void SystemTrayDelegateCommon::SwitchIME(const std::string& ime_id) { |
| 209 } | 209 } |
| 210 | 210 |
| 211 void SystemTrayDelegateCommon::ActivateIMEProperty(const std::string& key) { | 211 void SystemTrayDelegateCommon::ActivateIMEProperty(const std::string& key) { |
| 212 } | 212 } |
| 213 | 213 |
| 214 void SystemTrayDelegateCommon::ShowNetworkConfigure( | |
| 215 const std::string& network_id) { | |
| 216 } | |
| 217 | |
| 218 bool SystemTrayDelegateCommon::EnrollNetwork(const std::string& network_id) { | |
| 219 return true; | |
| 220 } | |
| 221 | |
| 222 void SystemTrayDelegateCommon::ManageBluetoothDevices() { | 214 void SystemTrayDelegateCommon::ManageBluetoothDevices() { |
| 223 } | 215 } |
| 224 | 216 |
| 225 void SystemTrayDelegateCommon::ToggleBluetooth() { | 217 void SystemTrayDelegateCommon::ToggleBluetooth() { |
| 226 } | 218 } |
| 227 | 219 |
| 228 void SystemTrayDelegateCommon::ShowMobileSimDialog() { | |
| 229 } | |
| 230 | |
| 231 void SystemTrayDelegateCommon::ShowMobileSetupDialog( | |
| 232 const std::string& service_path) { | |
| 233 } | |
| 234 | |
| 235 void SystemTrayDelegateCommon::ShowOtherNetworkDialog(const std::string& type) { | 220 void SystemTrayDelegateCommon::ShowOtherNetworkDialog(const std::string& type) { |
| 236 } | 221 } |
| 237 | 222 |
| 238 bool SystemTrayDelegateCommon::GetBluetoothAvailable() { | 223 bool SystemTrayDelegateCommon::GetBluetoothAvailable() { |
| 239 return false; | 224 return false; |
| 240 } | 225 } |
| 241 | 226 |
| 242 bool SystemTrayDelegateCommon::GetBluetoothEnabled() { | 227 bool SystemTrayDelegateCommon::GetBluetoothEnabled() { |
| 243 return false; | 228 return false; |
| 244 } | 229 } |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 const content::NotificationSource& source, | 295 const content::NotificationSource& source, |
| 311 const content::NotificationDetails& details) { | 296 const content::NotificationDetails& details) { |
| 312 if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) { | 297 if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) { |
| 313 ash::UpdateInfo info; | 298 ash::UpdateInfo info; |
| 314 GetUpdateInfo(content::Source<UpgradeDetector>(source).ptr(), &info); | 299 GetUpdateInfo(content::Source<UpgradeDetector>(source).ptr(), &info); |
| 315 GetSystemTrayNotifier()->NotifyUpdateRecommended(info); | 300 GetSystemTrayNotifier()->NotifyUpdateRecommended(info); |
| 316 } else { | 301 } else { |
| 317 NOTREACHED(); | 302 NOTREACHED(); |
| 318 } | 303 } |
| 319 } | 304 } |
| OLD | NEW |