alternate ntp: favicons and menu width enhancements for "Recent tabs" menu

chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h

Index: chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
index 0714661b95d73239849c5564cbf3f1cd544eea4e..aa5d0a5c12c96ed3ef7f2f7f2cdb5da7c1bd72ef 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
@@ -10,6 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
+#include "chrome/browser/sync/glue/synced_session.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/models/simple_menu_model.h"
 
@@ -59,11 +60,15 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel,
   void Build();
   void BuildLastClosed();
   void BuildDevices();
-  void BuildForeignTabItem(const std::string& session_tag,
-                           const SessionTab& tab,
-                           const std::string& session_name,
-                           bool need_separator);
-  void AddFavicon(int model_index, int command_id, const GURL& url);
+  void BuildForeignTabItem(
+      const std::string& session_tag,
+      const SessionTab& tab,
+      const std::string& session_name,
+      browser_sync::SyncedSession::DeviceType device_type,
+      bool need_separator);
+  void AddDeviceFavicon(int index_in_menu,
+                        browser_sync::SyncedSession::DeviceType device_type);
+  void AddTabFavicon(int model_index, int command_id, const GURL& url);
   void OnFaviconDataAvailable(FaviconService::Handle handle,
                               const history::FaviconImageResult& image_result);
   browser_sync::SessionModelAssociator* GetModelAssociator();
@@ -82,6 +87,9 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel,
   NavigationItems model_;
 
   gfx::Image default_favicon_;
+  gfx::Image laptop_favicon_;

[sky, 2012/11/13 17:41:49]

Is it really worth caching these? ResourceBundle lookup is quite fast.

[kuan, 2012/11/13 18:52:52]

Done.

+  gfx::Image phone_favicon_;
+  gfx::Image tablet_favicon_;
 
   CancelableRequestConsumerTSimple<int> favicon_consumer_;