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

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

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
« no previous file with comments | « chrome/browser/guestview/webview/webview_guest.h ('k') | chrome/renderer/resources/extensions/web_view.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/guestview/webview/webview_guest.cc
diff --git a/chrome/browser/guestview/webview/webview_guest.cc b/chrome/browser/guestview/webview/webview_guest.cc
index a7df8e965fd658873dfed29f1d65da2b59c8cfed..d581551f0d477b91081c9cf42301fa998544998a 100644
--- a/chrome/browser/guestview/webview/webview_guest.cc
+++ b/chrome/browser/guestview/webview/webview_guest.cc
@@ -11,6 +11,8 @@
#include "chrome/browser/guestview/guestview_constants.h"
#include "chrome/browser/guestview/webview/webview_constants.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/notification_source.h"
+#include "content/public/browser/notification_types.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
@@ -35,6 +37,9 @@ WebViewGuest::WebViewGuest(WebContents* guest_web_contents)
WebContentsObserver(guest_web_contents),
script_executor_(new extensions::ScriptExecutor(guest_web_contents,
&script_observers_)) {
+ notification_registrar_.Add(
+ this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
+ content::Source<WebContents>(guest_web_contents));
}
// static
@@ -68,6 +73,23 @@ AdViewGuest* WebViewGuest::AsAdView() {
return NULL;
}
+void WebViewGuest::Observe(int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
+ switch (type) {
+ case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME: {
+ DCHECK_EQ(content::Source<WebContents>(source).ptr(),
+ guest_web_contents());
+ if (content::Source<WebContents>(source).ptr() == guest_web_contents())
+ LoadHandlerCalled();
+ break;
+ }
+ default:
+ NOTREACHED() << "Unexpected notification sent.";
+ break;
+ }
+}
+
void WebViewGuest::Go(int relative_index) {
guest_web_contents()->GetController().GoToOffset(relative_index);
}
@@ -109,6 +131,11 @@ void WebViewGuest::WebContentsDestroyed(WebContents* web_contents) {
delete this;
}
+void WebViewGuest::LoadHandlerCalled() {
+ scoped_ptr<DictionaryValue> args(new DictionaryValue());
+ DispatchEvent(new GuestView::Event(webview::kEventContentLoad, args.Pass()));
+}
+
void WebViewGuest::AddWebViewToExtensionRendererState() {
ExtensionRendererState::WebViewInfo webview_info;
webview_info.embedder_process_id = embedder_render_process_id();
« no previous file with comments | « chrome/browser/guestview/webview/webview_guest.h ('k') | chrome/renderer/resources/extensions/web_view.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698