chrome/browser/ui/ash/system_tray_delegate_chromeos.h - Issue 1115083002: Add the supporting code for the cast system tray integration

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1115083002: Add the supporting code for the cast system tray integration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Share chromecast extension ids with other code Created 5 years, 7 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

« chrome/browser/ui/ash/cast_config_delegate_chromeos.cc ('K') | « chrome/browser/ui/ash/cast_config_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 167e3f49ffef28cd1c8c3344d7b50344b7122e96..259e2049e936811153834229c6be2550b8fadde7 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h

@@ -125,6 +125,7 @@ class SystemTrayDelegateChromeOS

bool GetBluetoothEnabled() override;

bool GetBluetoothDiscovering() override;

void ChangeProxySettings() override;

+ ash::CastConfigDelegate* GetCastConfigDelegate() const override;

ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;

ash::VolumeControlDelegate* GetVolumeControlDelegate() const override;

void SetVolumeControlDelegate(

@@ -291,6 +292,7 @@ class SystemTrayDelegateChromeOS

scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;

scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_;

+ scoped_ptr<ash::CastConfigDelegate> cast_config_delegate_;

scoped_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;

scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;

scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;