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

chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_
 #define CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_
 
 #include <set>
 
 #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"
 
 class Browser;
 struct SessionTab;
 
 namespace browser_sync {
 class SessionModelAssociator;
 }
 
@@ skipping 29 matching lines @@
   virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
 
  private:
   struct NavigationItem;
   typedef std::vector<NavigationItem> NavigationItems;
 
   // Build the menu items by populating the model.
   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();
 
   Browser* browser_;  // Weak.
 
   browser_sync::SessionModelAssociator* associator_;  // Weak.
 
   // Accelerator for reopening last closed tab.
   ui::Accelerator reopen_closed_tab_accelerator_;
 
   // Navigation items.  The |command_id| is set to kFirstTabCommandId plus the
   // index into this vector.  Upon invocation of the menu, the navigation
   // information is retrieved from |model_| and used to navigate to the item
   // specified.
   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_;
 
   base::WeakPtrFactory<RecentTabsSubMenuModel> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RecentTabsSubMenuModel);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_RECENT_TABS_SUB_MENU_MODEL_H_