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 d692e02d9a2a30fc049e436c660b774ed4fd4f56..9a01b04dbe56df1b568286552632837c9c0ad5dc 100644 |
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc |
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc |
@@ -370,8 +370,8 @@ void WebViewGuest::DidAttachToEmbedder() { |
void WebViewGuest::DidDropLink(const GURL& url) { |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
args->SetString(guest_view::kUrl, url.spec()); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventDropLink, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventDropLink, std::move(args)))); |
} |
void WebViewGuest::DidInitialize(const base::DictionaryValue& create_params) { |
@@ -425,8 +425,8 @@ void WebViewGuest::ClearDataInternal(base::Time remove_since, |
void WebViewGuest::GuestViewDidStopLoading() { |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventLoadStop, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventLoadStop, std::move(args)))); |
} |
void WebViewGuest::EmbedderFullscreenToggled(bool entered_fullscreen) { |
@@ -480,8 +480,8 @@ 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()); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventSizeChanged, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventSizeChanged, std::move(args)))); |
} |
bool WebViewGuest::IsAutoSizeSupported() const { |
@@ -496,8 +496,8 @@ void WebViewGuest::GuestZoomChanged(double old_zoom_level, |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
args->SetDouble(webview::kOldZoomFactor, old_zoom_factor); |
args->SetDouble(webview::kNewZoomFactor, new_zoom_factor); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventZoomChange, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventZoomChange, std::move(args)))); |
} |
void WebViewGuest::WillDestroy() { |
@@ -516,15 +516,15 @@ bool WebViewGuest::AddMessageToConsole(WebContents* source, |
args->SetString(webview::kMessage, message); |
args->SetInteger(webview::kLine, line_no); |
args->SetString(webview::kSourceId, source_id); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventConsoleMessage, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventConsoleMessage, std::move(args)))); |
return true; |
} |
void WebViewGuest::CloseContents(WebContents* source) { |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventClose, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventClose, std::move(args)))); |
} |
void WebViewGuest::FindReply(WebContents* source, |
@@ -574,8 +574,8 @@ void WebViewGuest::LoadProgressChanged(WebContents* source, double progress) { |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
args->SetString(guest_view::kUrl, web_contents()->GetURL().spec()); |
args->SetDouble(webview::kProgress, progress); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventLoadProgress, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventLoadProgress, std::move(args)))); |
} |
void WebViewGuest::LoadAbort(bool is_top_level, |
@@ -587,8 +587,8 @@ void WebViewGuest::LoadAbort(bool is_top_level, |
args->SetString(guest_view::kUrl, url.possibly_invalid_spec()); |
args->SetInteger(guest_view::kCode, error_code); |
args->SetString(guest_view::kReason, error_type); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventLoadAbort, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventLoadAbort, std::move(args)))); |
} |
void WebViewGuest::SetContextMenuPosition(const gfx::Point& position) { |
@@ -639,16 +639,16 @@ void WebViewGuest::RendererResponsive(WebContents* source) { |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
args->SetInteger(webview::kProcessId, |
web_contents()->GetRenderProcessHost()->GetID()); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventResponsive, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventResponsive, std::move(args)))); |
} |
void WebViewGuest::RendererUnresponsive(WebContents* source) { |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
args->SetInteger(webview::kProcessId, |
web_contents()->GetRenderProcessHost()->GetID()); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventUnresponsive, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventUnresponsive, std::move(args)))); |
} |
void WebViewGuest::Observe(int type, |
@@ -815,8 +815,8 @@ void WebViewGuest::DidCommitProvisionalLoadForFrame( |
web_contents()->GetController().GetEntryCount()); |
args->SetInteger(webview::kInternalProcessId, |
web_contents()->GetRenderProcessHost()->GetID()); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventLoadCommit, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventLoadCommit, std::move(args)))); |
find_helper_.CancelAllFindSessions(); |
} |
@@ -843,8 +843,8 @@ void WebViewGuest::DidStartProvisionalLoadForFrame( |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
args->SetString(guest_view::kUrl, validated_url.spec()); |
args->SetBoolean(guest_view::kIsTopLevel, !render_frame_host->GetParent()); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventLoadStart, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventLoadStart, std::move(args)))); |
} |
void WebViewGuest::RenderProcessGone(base::TerminationStatus status) { |
@@ -855,7 +855,8 @@ void WebViewGuest::RenderProcessGone(base::TerminationStatus status) { |
args->SetInteger(webview::kProcessId, |
web_contents()->GetRenderProcessHost()->GetID()); |
args->SetString(webview::kReason, TerminationStatusToString(status)); |
- DispatchEventToView(new GuestViewEvent(webview::kEventExit, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventExit, std::move(args)))); |
} |
void WebViewGuest::UserAgentOverrideSet(const std::string& user_agent) { |
@@ -882,14 +883,14 @@ void WebViewGuest::ReportFrameNameChange(const std::string& name) { |
name_ = name; |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
args->SetString(webview::kName, name); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventFrameNameChanged, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventFrameNameChanged, std::move(args)))); |
} |
void WebViewGuest::LoadHandlerCalled() { |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventContentLoad, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventContentLoad, std::move(args)))); |
} |
void WebViewGuest::LoadRedirect(const GURL& old_url, |
@@ -899,8 +900,8 @@ void WebViewGuest::LoadRedirect(const GURL& old_url, |
args->SetBoolean(guest_view::kIsTopLevel, is_top_level); |
args->SetString(webview::kNewURL, new_url.spec()); |
args->SetString(webview::kOldURL, old_url.spec()); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventLoadRedirect, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventLoadRedirect, std::move(args)))); |
} |
void WebViewGuest::PushWebViewStateToIOThread() { |
@@ -1137,11 +1138,9 @@ void WebViewGuest::ApplyAttributes(const base::DictionaryValue& params) { |
} |
} |
-void WebViewGuest::ShowContextMenu( |
- int request_id, |
- const WebViewGuestDelegate::MenuItemVector* items) { |
+void WebViewGuest::ShowContextMenu(int request_id) { |
if (web_view_guest_delegate_) |
- web_view_guest_delegate_->OnShowContextMenu(request_id, items); |
+ web_view_guest_delegate_->OnShowContextMenu(request_id); |
} |
void WebViewGuest::SetName(const std::string& name) { |
@@ -1495,8 +1494,8 @@ void WebViewGuest::SetFullscreenState(bool is_fullscreen) { |
// Dispatch a message so we can call document.webkitCancelFullscreen() |
// on the embedder. |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
- DispatchEventToView( |
- new GuestViewEvent(webview::kEventExitFullscreen, std::move(args))); |
+ DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventExitFullscreen, std::move(args)))); |
} |
// Since we changed fullscreen state, sending a Resize message ensures that |
// renderer/ sees the change. |