Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / android_webview / browser / icon_helper.h

diff --git a/src/android_webview/browser/icon_helper.h b/src/android_webview/browser/icon_helper.h
index d964063..f325450 100644 (file)
--- a/src/android_webview/browser/icon_helper.h
+++ b/src/android_webview/browser/icon_helper.h
@@ -6,6 +6,7 @@
 #define ANDROID_WEBVIEW_BROWSER_ICON_HELPER_H_
 
 #include <string>
+#include "base/containers/hash_tables.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "url/gurl.h"
 
@@ -41,8 +42,11 @@ class IconHelper : public content::WebContentsObserver {
   void SetListener(Listener* listener);
 
   // From WebContentsObserver
-  virtual void DidUpdateFaviconURL(int32 page_id,
+  virtual void DidUpdateFaviconURL(
       const std::vector<content::FaviconURL>& candidates) OVERRIDE;
+  virtual void DidStartNavigationToPendingEntry(
+      const GURL& url,
+      content::NavigationController::ReloadType reload_type) OVERRIDE;
 
   void DownloadFaviconCallback(
       int id,
@@ -52,8 +56,15 @@ class IconHelper : public content::WebContentsObserver {
       const std::vector<gfx::Size>& original_bitmap_sizes);
 
  private:
+  void MarkUnableToDownloadFavicon(const GURL& icon_url);
+  bool WasUnableToDownloadFavicon(const GURL& icon_url) const;
+  void ClearUnableToDownloadFavicons();
+
   Listener* listener_;
 
+  typedef uint32 MissingFaviconURLHash;
+  base::hash_set<MissingFaviconURLHash> missing_favicon_urls_;
+
   DISALLOW_COPY_AND_ASSIGN(IconHelper);
 };