| Index: content/renderer/render_frame_impl.h
|
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
|
| index cd89b850335fb9b7c1e7597bcd182fd847d41895..2c5c14b90394112a20f5f20f710b4612e5fa4eed 100644
|
| --- a/content/renderer/render_frame_impl.h
|
| +++ b/content/renderer/render_frame_impl.h
|
| @@ -15,6 +15,7 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "base/callback.h"
|
| #include "base/files/file_path.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/id_map.h"
|
| @@ -23,8 +24,10 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| +#include "base/optional.h"
|
| #include "base/process/process_handle.h"
|
| #include "base/single_thread_task_runner.h"
|
| +#include "base/unguessable_token.h"
|
| #include "build/build_config.h"
|
| #include "content/common/accessibility_mode.h"
|
| #include "content/common/associated_interface_registry_impl.h"
|
| @@ -82,6 +85,7 @@
|
|
|
| #if defined(OS_ANDROID)
|
| #include "content/renderer/media/android/renderer_media_player_manager.h"
|
| +#include "media/base/android/routing_token_callback.h"
|
| #endif
|
|
|
| struct FrameMsg_MixedContentFound_Params;
|
| @@ -759,6 +763,10 @@ class CONTENT_EXPORT RenderFrameImpl
|
| FRIEND_TEST_ALL_PREFIXES(RenderAccessibilityImplTest,
|
| AccessibilityMessagesQueueWhileSwappedOut);
|
| FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest, ZoomLimit);
|
| + FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest,
|
| + TestOverlayRoutingTokenSendsLater);
|
| + FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest,
|
| + TestOverlayRoutingTokenSendsNow);
|
|
|
| // A wrapper class used as the callback for JavaScript executed
|
| // in an isolated world.
|
| @@ -922,6 +930,7 @@ class CONTENT_EXPORT RenderFrameImpl
|
| void OnActivateNearestFindResult(int request_id, float x, float y);
|
| void OnGetNearestFindResult(int request_id, float x, float y);
|
| void OnFindMatchRects(int current_version);
|
| + void OnSetOverlayRoutingToken(const base::UnguessableToken& token);
|
| #endif
|
|
|
| #if BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
|
| @@ -1117,6 +1126,15 @@ class CONTENT_EXPORT RenderFrameImpl
|
|
|
| void InitializeBlameContext(RenderFrameImpl* parent_frame);
|
|
|
| +#if defined(OS_ANDROID)
|
| + // Send |callback| our AndroidOverlay routing token when it arrives. We may
|
| + // call |callback| before returning.
|
| + void GetOverlayRoutingToken(const media::RoutingTokenCallback& callback);
|
| +
|
| + // Ask the host to send our AndroidOverlay routing token to us.
|
| + void RequestOverlayRoutingTokenFromHost();
|
| +#endif
|
| +
|
| // Stores the WebLocalFrame we are associated with. This is null from the
|
| // constructor until BindToWebFrame is called, and it is null after
|
| // frameDetached is called until destruction (which is asynchronous in the
|
| @@ -1421,6 +1439,14 @@ class CONTENT_EXPORT RenderFrameImpl
|
| // is used and released in didStartProvisionalLoad().
|
| std::unique_ptr<PendingNavigationInfo> pending_navigation_info_;
|
|
|
| +#if defined(OS_ANDROID)
|
| + // AndroidOverlay routing token from the browser, if we have one yet.
|
| + base::Optional<base::UnguessableToken> overlay_routing_token_;
|
| +
|
| + // Callbacks that we should call when we get a routing token.
|
| + std::vector<media::RoutingTokenCallback> pending_routing_token_callbacks_;
|
| +#endif
|
| +
|
| base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
|
|
|