Simplify FaviconHandler

components/favicon/core/favicon_handler.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 COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_
 #define COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 194 matching lines @@
   void DownloadFaviconOrAskFaviconService(const GURL& page_url,
                                           const GURL& icon_url,
                                           favicon_base::IconType icon_type);
 
   // See description above class for details.
   void OnFaviconData(const std::vector<favicon_base::FaviconRawBitmapResult>&
                          favicon_bitmap_results);
 
   // Schedules a download for the specified entry. This adds the request to
   // download_requests_.
-  int ScheduleDownload(const GURL& url,
-                       const GURL& image_url,
-                       favicon_base::IconType icon_type);
+  void ScheduleDownload(const GURL& url,
+                        const GURL& image_url,
+                        favicon_base::IconType icon_type);
 
   // Updates |favicon_candidate_| and returns true if it is an exact match.
   bool UpdateFaviconCandidate(const GURL& url,
                               const GURL& image_url,
                               const gfx::Image& image,
                               float score,
                               favicon_base::IconType icon_type);
 
   // Sets the image data for the favicon.
   void SetFavicon(const GURL& url,
                   const GURL& icon_url,
                   const gfx::Image& image,
                   favicon_base::IconType icon_type);
 
   // Notifies |driver_| favicon available. See
   // FaviconDriver::NotifyFaviconAvailable() for |is_active_favicon| in detail.
   void NotifyFaviconAvailable(
       const std::vector<favicon_base::FaviconRawBitmapResult>&
-          favicon_bitmap_results,
-      bool is_active_favicon);
+          favicon_bitmap_results);
   void NotifyFaviconAvailable(const GURL& icon_url,
-                              const gfx::Image& image,
-                              bool is_active_favicon);
+                              const gfx::Image& image);
 
   // Return the current candidate if any.
   favicon::FaviconURL* current_candidate() {
     return (!image_urls_.empty()) ? &image_urls_.front() : NULL;
   }
 
   // Returns whether the page's url changed since the favicon was requested.
   bool PageChangedSinceFaviconWasRequested();
 
   // Returns the preferred size of the image. 0 means no preference (any size
   // will do).
   int preferred_icon_size() const {
     if (download_largest_icon_)
       return 0;
     return handler_type_ == FAVICON ? gfx::kFaviconSize : 0;
   }
 
   // Sorts the entries in |image_urls_| by icon size in descending order.
   // Additionally removes any entries whose sizes are all greater than the max
   // allowed size.
   void SortAndPruneImageUrls();
 
   // Used for FaviconService requests.
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // URL of the page we're requesting the favicon for.
   GURL url_;
 
-  // Whether we are waiting for data from the FaviconService.
-  bool waiting_for_favicon_service_data_;
-
   // Whether we got data back for the initial request to the FaviconService.
   bool got_favicon_from_history_;
 
   // Whether the favicon is out of date or the favicon data in
   // |history_results_| is known to be incomplete. If true, it means history
   // knows about the favicon, but we need to download the favicon because the
   // icon has expired or the data in the database is incomplete.
   bool favicon_expired_or_incomplete_;
 
   // Requests to the renderer to download favicons.
@@ skipping 27 matching lines @@
   // available the favicon service and the current page are updated (assuming
   // the image is for a favicon).
   FaviconCandidate best_favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 }  // namespace favicon
 
 #endif  // COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_