| Index: extensions/browser/guest_view/web_view/web_view_guest.cc
|
| diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
|
| index d4849436b400d202265d30f2a5a01b0b0e9dc2e7..1a4da97493c85df11c013f6bac3c3b5a46dc4847 100644
|
| --- a/extensions/browser/guest_view/web_view/web_view_guest.cc
|
| +++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
|
| @@ -320,7 +320,7 @@ void WebViewGuest::AttachWebViewHelpers(WebContents* contents) {
|
|
|
| void WebViewGuest::DidStopLoading() {
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventLoadStop, args.Pass()));
|
| }
|
|
|
| @@ -377,7 +377,7 @@ void WebViewGuest::GuestSizeChangedDueToAutoSize(const gfx::Size& old_size,
|
| args->SetInteger(webview::kOldWidth, old_size.width());
|
| args->SetInteger(webview::kNewHeight, new_size.height());
|
| args->SetInteger(webview::kNewWidth, new_size.width());
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventSizeChanged, args.Pass()));
|
| }
|
|
|
| @@ -405,14 +405,14 @@ bool WebViewGuest::AddMessageToConsole(WebContents* source,
|
| args->SetString(webview::kMessage, message);
|
| args->SetInteger(webview::kLine, line_no);
|
| args->SetString(webview::kSourceId, source_id);
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventConsoleMessage, args.Pass()));
|
| return true;
|
| }
|
|
|
| void WebViewGuest::CloseContents(WebContents* source) {
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventClose, args.Pass()));
|
| }
|
|
|
| @@ -460,7 +460,7 @@ void WebViewGuest::LoadProgressChanged(content::WebContents* source,
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| args->SetString(guestview::kUrl, web_contents()->GetURL().spec());
|
| args->SetDouble(webview::kProgress, progress);
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventLoadProgress, args.Pass()));
|
| }
|
|
|
| @@ -471,7 +471,7 @@ void WebViewGuest::LoadAbort(bool is_top_level,
|
| args->SetBoolean(guestview::kIsTopLevel, is_top_level);
|
| args->SetString(guestview::kUrl, url.possibly_invalid_spec());
|
| args->SetString(guestview::kReason, error_type);
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventLoadAbort, args.Pass()));
|
| }
|
|
|
| @@ -534,7 +534,7 @@ void WebViewGuest::RendererResponsive(content::WebContents* source) {
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| args->SetInteger(webview::kProcessId,
|
| web_contents()->GetRenderProcessHost()->GetID());
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventResponsive, args.Pass()));
|
| }
|
|
|
| @@ -542,7 +542,7 @@ void WebViewGuest::RendererUnresponsive(content::WebContents* source) {
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| args->SetInteger(webview::kProcessId,
|
| web_contents()->GetRenderProcessHost()->GetID());
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventUnresponsive, args.Pass()));
|
| }
|
|
|
| @@ -687,7 +687,7 @@ void WebViewGuest::DidCommitProvisionalLoadForFrame(
|
| web_contents()->GetController().GetEntryCount());
|
| args->SetInteger(webview::kInternalProcessId,
|
| web_contents()->GetRenderProcessHost()->GetID());
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventLoadCommit, args.Pass()));
|
|
|
| find_helper_.CancelAllFindSessions();
|
| @@ -722,7 +722,7 @@ void WebViewGuest::DidStartProvisionalLoadForFrame(
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| args->SetString(guestview::kUrl, validated_url.spec());
|
| args->SetBoolean(guestview::kIsTopLevel, !render_frame_host->GetParent());
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventLoadStart, args.Pass()));
|
| }
|
|
|
| @@ -750,7 +750,7 @@ void WebViewGuest::RenderProcessGone(base::TerminationStatus status) {
|
| args->SetInteger(webview::kProcessId,
|
| web_contents()->GetRenderProcessHost()->GetID());
|
| args->SetString(webview::kReason, TerminationStatusToString(status));
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventExit, args.Pass()));
|
| }
|
|
|
| @@ -767,13 +767,13 @@ void WebViewGuest::ReportFrameNameChange(const std::string& name) {
|
| name_ = name;
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| args->SetString(webview::kName, name);
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventFrameNameChanged, args.Pass()));
|
| }
|
|
|
| void WebViewGuest::LoadHandlerCalled() {
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventContentLoad, args.Pass()));
|
| }
|
|
|
| @@ -784,7 +784,7 @@ void WebViewGuest::LoadRedirect(const GURL& old_url,
|
| args->SetBoolean(guestview::kIsTopLevel, is_top_level);
|
| args->SetString(webview::kNewURL, new_url.spec());
|
| args->SetString(webview::kOldURL, old_url.spec());
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventLoadRedirect, args.Pass()));
|
| }
|
|
|
| @@ -1046,7 +1046,7 @@ void WebViewGuest::SetZoom(double zoom_factor) {
|
| scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
|
| args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_);
|
| args->SetDouble(webview::kNewZoomFactor, zoom_factor);
|
| - DispatchEventToEmbedder(
|
| + DispatchEventToView(
|
| new GuestViewBase::Event(webview::kEventZoomChange, args.Pass()));
|
| current_zoom_factor_ = zoom_factor;
|
| }
|
|
|