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

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.h

Issue 1602663003: Framelet Prototype 2016 using Mojo IPC Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Disabled oilpan Created 4 years, 11 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
Index: content/browser/browser_plugin/browser_plugin_guest.h
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index 9cdc85e96d2ba14a04ab4536da9407c2ce42def9..11bda3d62f017706224ba7fa1fe71e137f54ece4 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -120,9 +120,9 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
base::WeakPtr<BrowserPluginGuest> AsWeakPtr();
// Sets the focus state of the current RenderWidgetHostView.
- void SetFocus(RenderWidgetHost* rwh,
- bool focused,
- blink::WebFocusType focus_type);
+ void SetFocusForRenderWidgetHost(RenderWidgetHost* rwh,
+ bool focused,
+ blink::WebFocusType focus_type);
// Sets the tooltip text.
void SetTooltipText(const base::string16& tooltip_text);
@@ -161,7 +161,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
RenderWidgetHostView* GetOwnerRenderWidgetHostView();
bool focused() const { return focused_; }
- bool visible() const { return guest_visible_; }
+ bool container_visible() const { return container_visible_; }
bool is_in_destruction() { return is_in_destruction_; }
void UpdateVisibility();
@@ -181,10 +181,16 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
RenderFrameHost* render_frame_host) override;
// GuestHost implementation.
+ void Attach(int element_instance_id,
+ WebContents* embedder_web_contents,
+ const GuestAttachParams& attach_params) override;
int LoadURLWithParams(
const NavigationController::LoadURLParams& load_params) override;
void GuestResizeDueToAutoResize(const gfx::Size& new_size) override;
+ void SetContainerVisible(bool visible) override;
+ void SetFocus(bool focused, blink::WebFocusType focus_type) override;
void SizeContents(const gfx::Size& new_size) override;
+ void ForwardInputEvent(const blink::WebInputEvent* event) override;
void WillDestroy() override;
// Exposes the protected web_contents() from WebContentsObserver.
@@ -281,7 +287,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
private:
class EmbedderVisibilityObserver;
- void InitInternal(const BrowserPluginHostMsg_Attach_Params& params,
+ void InitInternal(const GuestAttachParams& params,
WebContentsImpl* owner_web_contents);
void OnSatisfySequence(int instance_id, const cc::SurfaceSequence& sequence);
@@ -386,7 +392,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
// Called when WillAttach is complete.
void OnWillAttachComplete(WebContentsImpl* embedder_web_contents,
- const BrowserPluginHostMsg_Attach_Params& params);
+ const GuestAttachParams& params);
// Returns identical message with current browser_plugin_instance_id() if
// the input was created with browser_plugin::kInstanceIdNone, else it returns
@@ -418,7 +424,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,
bool focused_;
bool mouse_locked_;
bool pending_lock_request_;
- bool guest_visible_;
+ bool container_visible_;
bool embedder_visible_;
// Whether the browser plugin is inside a plugin document.
bool is_full_page_plugin_;
« no previous file with comments | « components/resources/framelet_scaled_resources.grdp ('k') | content/browser/browser_plugin/browser_plugin_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698