Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / toolbar / recent_tabs_sub_menu_model.cc

diff --git a/src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
index 931e44a..135be4d 100644 (file)
--- a/src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
+++ b/src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
@@ -26,15 +26,14 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/grit/generated_resources.h"
 #include "components/favicon_base/favicon_types.h"
 #include "grit/browser_resources.h"
-#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "grit/ui_resources.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/favicon_size.h"
+#include "ui/resources/grit/ui_resources.h"
 
 #if defined(USE_ASH)
 #include "ash/accelerators/accelerator_table.h"
@@ -578,7 +577,7 @@ void RecentTabsSubMenuModel::AddDeviceFavicon(
     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));
@@ -613,9 +612,8 @@ void RecentTabsSubMenuModel::AddTabFavicon(int command_id, const GURL& url) {
   if (!favicon_service)
     return;
 
-  favicon_service->GetFaviconImageForURL(
-      FaviconService::FaviconForURLParams(
-          url, favicon_base::FAVICON, gfx::kFaviconSize),
+  favicon_service->GetFaviconImageForPageURL(
+      url,
       base::Bind(&RecentTabsSubMenuModel::OnFaviconDataAvailable,
                  weak_ptr_factory_.GetWeakPtr(),
                  command_id),
@@ -653,7 +651,8 @@ void RecentTabsSubMenuModel::ClearLocalEntries() {
   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();