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

Unified Diff: chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

Issue 1641563002: Remove linked_ptr usage in //base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase, really Created 4 years, 11 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/guest_view/web_view/chrome_web_view_guest_delegate.cc
diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc
index 4c9879e34bb69ec5596890207d30e6eb7336344d..32a00885584d246c0d3910a850ec96e0c9e07e03 100644
--- a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc
+++ b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc
@@ -67,8 +67,8 @@ bool ChromeWebViewGuestDelegate::HandleContextMenu(
MenuModelToValue(pending_menu_->menu_model());
args->Set(webview::kContextMenuItems, items.release());
args->SetInteger(webview::kRequestId, request_id);
- web_view_guest()->DispatchEventToView(
- new GuestViewEvent(webview::kEventContextMenuShow, std::move(args)));
+ web_view_guest()->DispatchEventToView(make_scoped_ptr(
+ new GuestViewEvent(webview::kEventContextMenuShow, std::move(args))));
return true;
}
@@ -99,10 +99,8 @@ scoped_ptr<base::ListValue> ChromeWebViewGuestDelegate::MenuModelToValue(
return items;
}
-void ChromeWebViewGuestDelegate::OnShowContextMenu(
- int request_id,
- const MenuItemVector* items) {
- if (!pending_menu_.get())
+void ChromeWebViewGuestDelegate::OnShowContextMenu(int request_id) {
+ if (!pending_menu_)
return;
// Make sure this was the correct request.
@@ -110,7 +108,6 @@ void ChromeWebViewGuestDelegate::OnShowContextMenu(
return;
// TODO(lazyboy): Implement.
- DCHECK(!items);
ContextMenuDelegate* menu_delegate =
ContextMenuDelegate::FromWebContents(guest_web_contents());

Powered by Google App Engine
This is Rietveld 408576698