Chromium side of moving clearContextMenu from WebViewClient to WebFrameClient.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 2105 matching lines @@
 void RenderViewImpl::hideValidationMessage() {
   Send(new ViewHostMsg_HideValidationMessage(routing_id()));
 }
 
 void RenderViewImpl::moveValidationMessage(
     const blink::WebRect& anchor_in_root_view) {
   Send(new ViewHostMsg_MoveValidationMessage(routing_id(),
                                              anchor_in_root_view));
 }
 
+#if !defined(CLEAR_CONTEXT_MENU_ON_WEB_FRAME_CLIENT)
 void RenderViewImpl::clearContextMenu() {
   context_menu_node_.reset();
 }
+#endif
 
 void RenderViewImpl::setStatusText(const WebString& text) {
 }
 
 void RenderViewImpl::UpdateTargetURL(const GURL& url,
                                      const GURL& fallback_url) {
   GURL latest_url = url.is_empty() ? fallback_url : url;
   if (latest_url == target_url_)
     return;
 
@@ skipping 3063 matching lines @@
   for (size_t i = 0; i < icon_urls.size(); i++) {
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content