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

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

Issue 2761993002: cros: Eliminate bluetooth methods from SystemTrayDelegate (Closed)
Patch Set: review comments Created 3 years, 9 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: 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 de17d47aec3c0eaaec72fdfbb22210a086ef37c5..ccc9cd233818c57bf7357884b2872cb41ff236ac 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -15,7 +15,6 @@
#include "ash/common/login_status.h"
#include "ash/common/shell_delegate.h"
-#include "ash/common/system/chromeos/bluetooth/tray_bluetooth_helper.h"
#include "ash/common/system/chromeos/power/power_status.h"
#include "ash/common/system/chromeos/session/logout_button_observer.h"
#include "ash/common/system/date/clock_observer.h"
@@ -341,28 +340,6 @@ void SystemTrayDelegateChromeOS::ShowUserLogin() {
}
}
-void SystemTrayDelegateChromeOS::GetAvailableBluetoothDevices(
- ash::BluetoothDeviceList* list) {
- ash::Shell::Get()->tray_bluetooth_helper()->GetAvailableDevices(list);
-}
-
-void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() {
- ash::Shell::Get()->tray_bluetooth_helper()->StartDiscovering();
-}
-
-void SystemTrayDelegateChromeOS::BluetoothStopDiscovering() {
- ash::Shell::Get()->tray_bluetooth_helper()->StopDiscovering();
-}
-
-void SystemTrayDelegateChromeOS::ConnectToBluetoothDevice(
- const std::string& address) {
- ash::Shell::Get()->tray_bluetooth_helper()->ConnectToDevice(address);
-}
-
-bool SystemTrayDelegateChromeOS::IsBluetoothDiscovering() const {
- return ash::Shell::Get()->tray_bluetooth_helper()->IsDiscovering();
-}
-
void SystemTrayDelegateChromeOS::GetCurrentIME(ash::IMEInfo* info) {
input_method::InputMethodManager* manager =
input_method::InputMethodManager::Get();
@@ -423,22 +400,6 @@ void SystemTrayDelegateChromeOS::ActivateIMEProperty(const std::string& key) {
input_method::InputMethodManager::Get()->ActivateInputMethodMenuItem(key);
}
-void SystemTrayDelegateChromeOS::ToggleBluetooth() {
- ash::Shell::Get()->tray_bluetooth_helper()->ToggleEnabled();
-}
-
-bool SystemTrayDelegateChromeOS::GetBluetoothAvailable() {
- return ash::Shell::Get()->tray_bluetooth_helper()->GetAvailable();
-}
-
-bool SystemTrayDelegateChromeOS::GetBluetoothEnabled() {
- return ash::Shell::Get()->tray_bluetooth_helper()->GetEnabled();
-}
-
-bool SystemTrayDelegateChromeOS::GetBluetoothDiscovering() {
- return ash::Shell::Get()->tray_bluetooth_helper()->HasDiscoverySession();
-}
-
ash::NetworkingConfigDelegate*
SystemTrayDelegateChromeOS::GetNetworkingConfigDelegate() const {
return networking_config_delegate_.get();

Powered by Google App Engine
This is Rietveld 408576698