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

Unified Diff: ash/common/system/chromeos/cast/tray_cast.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
« no previous file with comments | « ash/common/mojo_interface_factory.cc ('k') | ash/common/system/chromeos/cast/tray_cast.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/cast/tray_cast.h
diff --git a/ash/common/system/chromeos/cast/tray_cast.h b/ash/common/system/chromeos/cast/tray_cast.h
index 234949f00c993043e7e4dc7f015b7bbe516ccca4..ae7fda7d9d5d3cbeb121471c6f94ad66c88e8638 100644
--- a/ash/common/system/chromeos/cast/tray_cast.h
+++ b/ash/common/system/chromeos/cast/tray_cast.h
@@ -5,7 +5,10 @@
#ifndef ASH_COMMON_SYSTEM_CHROMEOS_CAST_TRAY_CAST_H_
#define ASH_COMMON_SYSTEM_CHROMEOS_CAST_TRAY_CAST_H_
-#include "ash/common/cast_config_delegate.h"
+#include <string>
+#include <vector>
+
+#include "ash/common/cast_config_controller.h"
#include "ash/common/shell_observer.h"
#include "ash/common/system/tray/system_tray_item.h"
#include "base/macros.h"
@@ -19,7 +22,7 @@ class CastDuplexView;
class ASH_EXPORT TrayCast : public SystemTrayItem,
public ShellObserver,
- public CastConfigDelegate::Observer {
+ public CastConfigControllerObserver {
public:
explicit TrayCast(SystemTray* system_tray);
~TrayCast() override;
@@ -46,9 +49,8 @@ class ASH_EXPORT TrayCast : public SystemTrayItem,
// Overridden from ShellObserver.
void OnCastingSessionStartedOrStopped(bool started) override;
- // Overridden from CastConfigDelegate::Observer.
- void OnDevicesUpdated(
- const CastConfigDelegate::SinksAndRoutes& devices) override;
+ // Overridden from CastConfigObserver.
+ void OnDevicesUpdated(std::vector<mojom::SinkAndRoutePtr> devices) override;
// This makes sure that the current view displayed in the tray is the correct
// one, depending on if we are currently casting. If we're casting, then a
@@ -63,7 +65,7 @@ class ASH_EXPORT TrayCast : public SystemTrayItem,
// device is not actively transmitting information to the cast sink.
bool HasActiveRoute();
- CastConfigDelegate::SinksAndRoutes sinks_and_routes_;
+ std::vector<mojom::SinkAndRoutePtr> sinks_and_routes_;
// True if there is a mirror-based cast session and the active-cast tray icon
// should be shown.
« no previous file with comments | « ash/common/mojo_interface_factory.cc ('k') | ash/common/system/chromeos/cast/tray_cast.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698