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

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

Issue 2525563003: mash: Change CastConfigDelegate to a mojoified CastConfigClient. (Closed)
Patch Set: move dep to chromeos section Created 4 years 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.h
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index a29dc9e41e570d387e5185d7056f4b438320988e..db10ab44d5cb6524d8f43f921a7b86e28947cd50 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -7,6 +7,7 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include <vector>
@@ -103,7 +104,6 @@ class SystemTrayDelegateChromeOS
bool GetBluetoothAvailable() override;
bool GetBluetoothEnabled() override;
bool GetBluetoothDiscovering() override;
- ash::CastConfigDelegate* GetCastConfigDelegate() override;
ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;
bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
@@ -239,7 +239,6 @@ class SystemTrayDelegateChromeOS
scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
std::unique_ptr<device::BluetoothDiscoverySession>
bluetooth_discovery_session_;
- std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_;
std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
@@ -254,4 +253,5 @@ class SystemTrayDelegateChromeOS
ash::SystemTrayDelegate* CreateSystemTrayDelegate();
} // namespace chromeos
+
#endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
« no previous file with comments | « chrome/browser/ui/ash/cast_config_delegate_media_router.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698