Index: content/browser/frame_host/render_frame_host_impl.h |
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h |
index d0c8d132387ffa28eb11781a1e3cbcb409da901f..b9557044060230919c84e283bff13b7b3d594562 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.h |
+++ b/content/browser/frame_host/render_frame_host_impl.h |
@@ -19,6 +19,7 @@ |
#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
+#include "base/optional.h" |
#include "base/strings/string16.h" |
#include "base/supports_user_data.h" |
#include "base/time/time.h" |
@@ -134,12 +135,19 @@ class CONTENT_EXPORT RenderFrameHostImpl |
static RenderFrameHostImpl* FromID(int process_id, int routing_id); |
static RenderFrameHostImpl* FromAXTreeID( |
ui::AXTreeIDRegistry::AXTreeID ax_tree_id); |
+#if defined(OS_ANDROID) |
+ static RenderFrameHostImpl* FromOverlayRoutingToken( |
+ const base::UnguessableToken& token); |
+#endif |
~RenderFrameHostImpl() override; |
// RenderFrameHost |
int GetRoutingID() override; |
ui::AXTreeIDRegistry::AXTreeID GetAXTreeID() override; |
+#if defined(OS_ANDROID) |
+ const base::UnguessableToken& GetOverlayRoutingToken() override; |
+#endif |
SiteInstanceImpl* GetSiteInstance() override; |
RenderProcessHost* GetProcess() override; |
RenderWidgetHostView* GetView() override; |
@@ -786,6 +794,10 @@ class CONTENT_EXPORT RenderFrameHostImpl |
#endif |
#if defined(OS_ANDROID) |
void OnNavigationHandledByEmbedder(); |
+ |
+ // Called when the frame would like an overlay routing token. This will |
+ // create one if needed. Either way, it will send it to the frame. |
+ void OnRequestOverlayRoutingToken(); |
#endif |
void OnShowCreatedWindow(int pending_widget_routing_id, |
WindowOpenDisposition disposition, |
@@ -1164,6 +1176,10 @@ class CONTENT_EXPORT RenderFrameHostImpl |
#if defined(OS_ANDROID) |
std::unique_ptr<service_manager::InterfaceProvider> java_interfaces_; |
+ |
+ // IPC-friendly token that represents this host for AndroidOverlays, if we |
+ // have created one yet. |
+ base::Optional<base::UnguessableToken> overlay_routing_token_; |
#endif |
// NOTE: This must be the last member. |