Applied the IconType.

chrome/browser/history/history.h

 // Copyright (c) 2010 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 CHROME_BROWSER_HISTORY_HISTORY_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_H_
 #pragma once
 
 #include <set>
 #include <vector>
@@ skipping 625 matching lines @@
   void OnDBLoaded();
 
   // FavIcon -------------------------------------------------------------------
 
   // These favicon methods are exposed to the FaviconService. Instead of calling
   // these methods directly you should call the respective method on the
   // FaviconService.
 
   // Used by the FaviconService to get a favicon from the history backend.
   void GetFavicon(FaviconService::GetFaviconRequest* request,
-                  const GURL& icon_url);
+                  const GURL& icon_url, history::IconType icon_type);

[sky, 2011/03/10 17:54:44]

Once you wrap a function declaration (or definition) put each arg on its own
line.

 
   // Used by the FaviconService to update the favicon mappings on the history
   // backend.
   void UpdateFaviconMappingAndFetch(FaviconService::GetFaviconRequest* request,
                                     const GURL& page_url,
-                                    const GURL& icon_url);
+                                    const GURL& icon_url,
+                                    history::IconType icon_type);
 
   // Used by the FaviconService to get a favicon from the history backend.
   void GetFaviconForURL(FaviconService::GetFaviconRequest* request,
-                        const GURL& page_url);
+                        const GURL& page_url,
+                        int icon_type);

[sky, 2011/03/10 17:54:44]

icon_types

[michaelbai, 2011/03/11 01:11:28]

Done.

 
   // Used by the FaviconService to mark the favicon for the page as being out
   // of date.
   void SetFaviconOutOfDateForPage(const GURL& page_url);
 
   // Used by the FaviconService for importing many favicons for many pages at
   // once. The pages must exist, any favicon sets for unknown pages will be
   // discarded. Existing favicons will not be overwritten.
   void SetImportedFavicons(
       const std::vector<history::ImportedFavIconUsage>& favicon_usage);
 
   // Used by the FaviconService to set the favicon for a page on the history
   // backend.
   void SetFavicon(const GURL& page_url,
                   const GURL& icon_url,
-                  const std::vector<unsigned char>& image_data);
+                  const std::vector<unsigned char>& image_data,
+                  history::IconType icon_types);

[sky, 2011/03/10 17:54:44]

icon_type

[michaelbai, 2011/03/11 01:11:28]

Done.

 
 
   // Sets the in-memory URL database. This is called by the backend once the
   // database is loaded to make it available.
   void SetInMemoryBackend(history::InMemoryHistoryBackend* mem_backend);
 
   // Called by our BackendDelegate when there is a problem reading the database.
   // |message_id| is the relevant message in the string table to display.
   void NotifyProfileError(int message_id);
 
@@ skipping 180 matching lines @@
   BookmarkService* bookmark_service_;
   bool no_db_;
 
   // True if needs top site migration.
   bool needs_top_sites_migration_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_H_