Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc

 // Copyright 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 "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 560 matching lines @@
       break;
 
     case browser_sync::SyncedSession::TYPE_CHROMEOS:
     case browser_sync::SyncedSession::TYPE_WIN:
     case browser_sync::SyncedSession::TYPE_MACOSX:
     case browser_sync::SyncedSession::TYPE_LINUX:
     case browser_sync::SyncedSession::TYPE_OTHER:
     case browser_sync::SyncedSession::TYPE_UNSET:
       favicon_id = IDR_LAPTOP_FAVICON;
       break;
-  };
+  }
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   SetIcon(index_in_menu, rb.GetNativeImageNamed(favicon_id));
 }
 
 void RecentTabsSubMenuModel::AddTabFavicon(int command_id, const GURL& url) {
   bool is_local_tab = command_id < kFirstOtherDevicesTabCommandId;
   int index_in_menu = GetIndexOfCommandId(command_id);
 
   if (!is_local_tab) {
@@ skipping 14 matching lines @@
 
   // Otherwise, start to fetch the favicon from local history asynchronously.
   // Set default icon first.
   SetIcon(index_in_menu, default_favicon_);
   // Start request to fetch actual icon if possible.
   FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
       browser_->profile(), Profile::EXPLICIT_ACCESS);
   if (!favicon_service)
     return;
 
-  favicon_service->GetFaviconImageForURL(
-      FaviconService::FaviconForURLParams(
+  favicon_service->GetFaviconImageForPageURL(
+      FaviconService::FaviconForPageURLParams(
           url, favicon_base::FAVICON, gfx::kFaviconSize),
       base::Bind(&RecentTabsSubMenuModel::OnFaviconDataAvailable,
                  weak_ptr_factory_.GetWeakPtr(),
                  command_id),
       is_local_tab ? &local_tab_cancelable_task_tracker_
                    : &other_devices_tab_cancelable_task_tracker_);
 }
 
 void RecentTabsSubMenuModel::OnFaviconDataAvailable(
     int command_id,
@@ skipping 18 matching lines @@
   }
   *tab_items = &local_tab_navigation_items_;
   return command_id - kFirstLocalTabCommandId;
 }
 
 void RecentTabsSubMenuModel::ClearLocalEntries() {
   // Remove local items (recently closed tabs and windows) from menumodel.
   while (last_local_model_index_ >= 0)
     RemoveItemAt(last_local_model_index_--);
 
-  // Cancel asynchronous FaviconService::GetFaviconImageForURL() tasks of all
+  // Cancel asynchronous FaviconService::GetFaviconImageForPageURL() tasks of
+  // all
   // local tabs.
   local_tab_cancelable_task_tracker_.TryCancelAll();
 
   // Remove all local tab navigation items.
   local_tab_navigation_items_.clear();
 
   // Remove all local window items.
   local_window_items_.clear();
 }
 
@@ skipping 17 matching lines @@
 
   ui::MenuModelDelegate* menu_model_delegate = GetMenuModelDelegate();
   if (menu_model_delegate)
     menu_model_delegate->OnMenuStructureChanged();
 }
 
 void RecentTabsSubMenuModel::TabRestoreServiceDestroyed(
     TabRestoreService* service) {
   TabRestoreServiceChanged(service);
 }