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

Unified Diff: chrome/browser/guestview/webview/webview_guest.h

Issue 17846010: <webview>: Move contentload event from content to chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@guestview_loadstop
Patch Set: Merge with ToT Created 7 years, 6 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: chrome/browser/guestview/webview/webview_guest.h
diff --git a/chrome/browser/guestview/webview/webview_guest.h b/chrome/browser/guestview/webview/webview_guest.h
index f6d3b1d14981e26f8880df2923d46a811ef6dd5d..3a988b815cbf5848c2e47b8ce89347d3f85f17b7 100644
--- a/chrome/browser/guestview/webview/webview_guest.h
+++ b/chrome/browser/guestview/webview/webview_guest.h
@@ -8,6 +8,7 @@
#include "base/observer_list.h"
#include "chrome/browser/extensions/tab_helper.h"
#include "chrome/browser/guestview/guestview.h"
+#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_contents_observer.h"
namespace extensions {
@@ -22,6 +23,7 @@ class ScriptExecutor;
// or through the use of the New Window API, when a new window is attached to
// a particular <webview>.
class WebViewGuest : public GuestView,
+ public content::NotificationObserver,
public content::WebContentsObserver {
public:
explicit WebViewGuest(content::WebContents* guest_web_contents);
@@ -37,6 +39,11 @@ class WebViewGuest : public GuestView,
virtual WebViewGuest* AsWebView() OVERRIDE;
virtual AdViewGuest* AsAdView() OVERRIDE;
+ // NotificationObserver implementation.
+ virtual void Observe(int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) OVERRIDE;
+
// If possible, navigate the guest to |relative_index| entries away from the
// current navigation entry.
void Go(int relative_index);
@@ -48,6 +55,7 @@ class WebViewGuest : public GuestView,
private:
virtual ~WebViewGuest();
+ // WebContentsObserver implementation.
virtual void DidCommitProvisionalLoadForFrame(
int64 frame_id,
bool is_main_frame,
@@ -59,6 +67,9 @@ class WebViewGuest : public GuestView,
virtual void WebContentsDestroyed(
content::WebContents* web_contents) OVERRIDE;
+ // Called after the load handler is called in the guest's main frame.
+ void LoadHandlerCalled();
+
void AddWebViewToExtensionRendererState();
static void RemoveWebViewFromExtensionRendererState(
content::WebContents* web_contents);
@@ -67,6 +78,8 @@ class WebViewGuest : public GuestView,
script_observers_;
scoped_ptr<extensions::ScriptExecutor> script_executor_;
+ content::NotificationRegistrar notification_registrar_;
+
DISALLOW_COPY_AND_ASSIGN(WebViewGuest);
};
« no previous file with comments | « chrome/browser/guestview/webview/webview_constants.cc ('k') | chrome/browser/guestview/webview/webview_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698