Send enter / exit fullscreen signal to AVDA

media/base/overlay_info.h

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_OVERLAY_INFO_H_
 #define MEDIA_BASE_OVERLAY_INFO_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/optional.h"
 #include "base/unguessable_token.h"
+#include "media/base/media_export.h"
+#include "media/base/surface_manager.h"

[tguilbert, 2017/05/24 22:47:58]

Remove surface_manager.h?

[liberato (no reviews please), 2017/05/25 05:42:49]

Done.

 
 namespace media {
 
+struct MEDIA_EXPORT OverlayInfo {
+  OverlayInfo();
+  OverlayInfo(const OverlayInfo&);
+
+  static OverlayInfo SurfaceChange(int surface_id);

[tguilbert, 2017/05/24 22:47:58]

I assume these will be used somewhere at some point.

[liberato (no reviews please), 2017/05/25 05:42:49]

wmpi was going to use them, but i guess it doesn't now.  i should have removed
them.  Done.

+  static OverlayInfo RoutingTokenChange(
+      base::Optional<base::UnguessableToken> token);
+  static OverlayInfo FullscreenChange(bool is_fullscreen);
+
+  // Copy all values specified in |other| into |this|, and leave unchanged any
+  // that |other| doesn't specify.
+  void MergeWith(const OverlayInfo& other);
+
+  // An unset routing token indicates "do not use any routing token".  A null
+  // routing token isn't serializable, else we'd probably use that instead.
+  using RoutingToken = base::Optional<base::UnguessableToken>;
+
+  // If any of these are not provided, then the intention is that this message
+  // does not make any claims about them.  For example, one might receive an
+  // OverlayInfo with |routing_token| supplied, then a later one with
+  // |is_fullscreen| supplied.  The first message makes no claims about whether
+  // one is in fullscreen or not.  The second one does not provide any update
+  // to the routing token.
+
+  // Of course, one message may specify more than one of these.
+
+  // If provided, this is the SurfaceManager surface id, or
+  // SurfaceManager:;kNoSurfaceID to indicate that no surface should be used.

[tguilbert, 2017/05/24 22:47:58]

NIT: Typo. s/:;/::

[liberato (no reviews please), 2017/05/25 05:42:49]

Done.

+  base::Optional<int> surface_id;
+
+  // If provided, the mojo AndroidOverlay routing token or "use no token" if
+  // !(*routing_token).  Note the extra indirection; |routing_token| is, itself,
+  // a base::Optional.
+  base::Optional<RoutingToken> routing_token;
+
+  // If provided, indicates whether we're in fullscreen mode or not.
+  base::Optional<bool> is_fullscreen;
+
+  // NOTE: if one adds any other members, then be sure to update MergeWith to
+  // copy them as well.
+
+  // Convenience functions to return true if and only if this specifies a
+  // surface ID / routing token that is not kNoSurfaceID / empty.  I.e., if we
+  // provide enough info to create an overlay.
+  bool HasValidSurfaceId() const;
+  bool HasValidRoutingToken() const;
+};
+
 // Request information to construct an overlay.  This can be either a surface_id
 // or an AndroidOverlay routing token.
-using ProvideOverlayInfoCB =
-    base::Callback<void(int, const base::Optional<base::UnguessableToken>&)>;
+using ProvideOverlayInfoCB = base::Callback<void(const OverlayInfo&)>;
 using RequestOverlayInfoCB =
     base::Callback<void(bool, const ProvideOverlayInfoCB&)>;
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_OVERLAY_INFO_H_