Move IconURLs method from WebFrame to WebLocalFrame

content/renderer/render_view_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 32 matching lines @@
 #include "content/renderer/stats_collection_observer.h"
 #include "ipc/ipc_platform_file.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/web/WebAXObject.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
-#include "third_party/WebKit/public/web/WebIconURL.h"
 #include "third_party/WebKit/public/web/WebNavigationType.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 #include "third_party/WebKit/public/web/WebViewClient.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/surface/transport_dib.h"
 
 #if defined(OS_ANDROID)
 #include "content/renderer/android/renderer_date_time_picker.h"
 #endif
 
 #if defined(COMPILER_MSVC)
 // RenderViewImpl is a diamond-shaped hierarchy, with WebWidgetClient at the
 // root. VS warns when we inherit the WebWidgetClient method implementations
 // from RenderWidget.  It's safe to ignore that warning.
 #pragma warning(disable: 4250)
 #endif
 
 namespace blink {
 class WebDataSource;
 class WebDateTimeChooserCompletion;
 class WebGestureEvent;
-class WebIconURL;
 class WebMouseEvent;
 class WebSpeechRecognizer;
 class WebStorageNamespace;
 class WebURLRequest;
 struct WebActiveWheelFlingParameters;
 struct WebDateTimeChooserParams;
 struct WebMediaPlayerAction;
 struct WebPluginAction;
 struct WebPoint;
 struct WebWindowFeatures;
 }  // namespace blink
 
 namespace gfx {
 class ICCProfile;
 }
 
 namespace content {
 
 class IdleUserDetector;
 class RendererDateTimePicker;
 class RenderViewImplTest;
 class RenderViewObserver;
 class RenderViewTest;
 class SpeechRecognitionDispatcher;
-struct FaviconURL;
 struct FileChooserParams;
 struct ResizeParams;
 
 namespace mojom {
 class CreateViewParams;
 }
 
 //
 // RenderView is an object that manages a WebView object, and provides a
 // communication interface with an embedding application process.
@@ skipping 373 matching lines @@
   bool RenderWidgetWillHandleMouseEvent(
       const blink::WebMouseEvent& event) override;
 
   // Old WebFrameClient implementations ----------------------------------------
 
   // RenderViewImpl used to be a WebFrameClient, but now RenderFrameImpl is the
   // WebFrameClient. However, many implementations of WebFrameClient methods
   // still live here and are called from RenderFrameImpl. These implementations
   // are to be moved to RenderFrameImpl <http://crbug.com/361761>.
 
-  void didChangeIcon(blink::WebLocalFrame*, blink::WebIconURL::Type);
-
   static Referrer GetReferrerFromRequest(
       blink::WebFrame* frame,
       const blink::WebURLRequest& request);
 
   static WindowOpenDisposition NavigationPolicyToDisposition(
       blink::WebNavigationPolicy policy);
 
   void ApplyWebPreferencesInternal(const WebPreferences& prefs,
                                    blink::WebView* web_view,
                                    CompositorDependencies* compositor_deps);
@@ skipping 78 matching lines @@
 #endif
 
   // In OOPIF-enabled modes, this tells each RenderFrame with a pending state
   // update to inform the browser process.
   void SendFrameStateUpdates();
 
   // Update the target url and tell the browser that the target URL has changed.
   // If |url| is empty, show |fallback_url|.
   void UpdateTargetURL(const GURL& url, const GURL& fallback_url);
 
-  // Tells the browser what the new list of favicons for the webpage is.
-  void SendUpdateFaviconURL(const std::vector<FaviconURL>& urls);
-
-  // Invoked from DidStopLoading(). Sends the current list of loaded favicons to
-  // the browser.
-  void DidStopLoadingIcons();
-
   // Coordinate conversion -----------------------------------------------------
 
   gfx::RectF ClientRectToPhysicalWindowRect(const gfx::RectF& rect) const;
 
   // RenderFrameImpl accessible state ------------------------------------------
   // The following section is the set of methods that RenderFrameImpl needs
   // to access RenderViewImpl state. The set of state variables are page-level
   // specific, so they don't belong in RenderFrameImpl and should remain in
   // this object.
   base::ObserverList<RenderViewObserver>& observers() { return observers_; }
@@ skipping 213 matching lines @@
   // ---------------------------------------------------------------------------
 
   base::WeakPtrFactory<RenderViewImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_