Chromium Code Reviews| Index: chrome/browser/guest_view/web_view/web_view_guest.h |
| diff --git a/chrome/browser/guest_view/web_view/web_view_guest.h b/chrome/browser/guest_view/web_view/web_view_guest.h |
| index ee86f63b03ac6e950ad9540914f03f061d77a7ac..3f9c9ca11888e0e9a7b6acdd89b34929170efb63 100644 |
| --- a/chrome/browser/guest_view/web_view/web_view_guest.h |
| +++ b/chrome/browser/guest_view/web_view/web_view_guest.h |
| @@ -63,6 +63,9 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
| // |items| == NULL means no filtering will be applied. |
| void ShowContextMenu(int request_id, const MenuItemVector* items); |
| + // Sets the frame name of the guest. |
| + void SetName(const std::string& name); |
| + |
| // GuestViewBase implementation. |
| virtual void Attach(content::WebContents* embedder_web_contents, |
| const base::DictionaryValue& args) OVERRIDE; |
| @@ -128,6 +131,9 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
| const base::string16& frame_name, |
| const GURL& target_url, |
| content::WebContents* new_contents) OVERRIDE; |
| + virtual void FrameNameChanged(int render_frame_id, |
| + bool is_top_level, |
| + const std::string& name) OVERRIDE; |
| // NotificationObserver implementation. |
| virtual void Observe(int type, |
| @@ -195,9 +201,10 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
| bool allow, |
| const std::string& user_input); |
| - void OnWebViewNewWindowResponse(int new_window_instance_id, |
| - bool allow, |
| - const std::string& user_input); |
| + void OnWebViewNewWindowResponse( |
|
lazyboy
2014/05/21 16:27:05
nit: Revert this change.
Fady Samuel
2014/05/21 16:56:49
Done.
|
| + int new_window_instance_id, |
| + bool allow, |
| + const std::string& user_input); |
| enum PermissionResponseAction { |
| DENY, |
| @@ -293,6 +300,10 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
| content::RenderViewHost* render_view_host) OVERRIDE; |
| virtual void WebContentsDestroyed() OVERRIDE; |
| virtual void UserAgentOverrideSet(const std::string& user_agent) OVERRIDE; |
| + virtual void RenderViewReady() OVERRIDE; |
| + |
| + // Informs the embedder of a frame name change. |
| + void ReportFrameNameChange(const std::string& name); |
| // Called after the load handler is called in the guest's main frame. |
| void LoadHandlerCalled(); |
| @@ -382,6 +393,9 @@ class WebViewGuest : public GuestView<WebViewGuest>, |
| // Stores the current zoom factor. |
| double current_zoom_factor_; |
| + // Stores the window name of the main frame of the guest. |
| + std::string name_; |
| + |
| // Handles find requests and replies for the webview find API. |
| WebviewFindHelper find_helper_; |