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

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/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/glue/synced_session.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.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/base/text/text_elider.h"
 #include "ui/gfx/favicon_size.h"
 
 #if defined(USE_ASH)
 #include "ash/accelerators/accelerator_table.h"
 #endif  // defined(USE_ASH)
 
 namespace {
 
 // First comamnd id for navigatable (and hence executable) tab menu item.
 // The model and menu are not 1-1:
@@ skipping 258 matching lines @@
     std::sort(tabs_in_session.begin(), tabs_in_session.end(),
               SortTabsByRecency);
 
     // Build tab menu items from sorted session tabs.
     const size_t kMaxTabsPerSessionToShow = 4;
     for (size_t k = 0;
          k < std::min(tabs_in_session.size(), kMaxTabsPerSessionToShow);
          ++k) {
       BuildForeignTabItem(session_tag, *tabs_in_session[k],
           // Only need |session_name| for the first tab of the session.
-          !k ? session->session_name : std::string(), need_separator);
+          !k ? session->session_name : std::string(), session->device_type,
+          need_separator);
       need_separator = false;
     }  // for all tabs in one session
 
     ++num_sessions_added;
     need_separator = true;
   }  // for all sessions
 }
 
 void RecentTabsSubMenuModel::BuildForeignTabItem(
     const std::string& session_tag,
     const SessionTab& tab,
     const std::string& session_name,
+    browser_sync::SyncedSession::DeviceType device_type,
     bool need_separator) {
   if (need_separator)
     AddSeparator(ui::NORMAL_SEPARATOR);
 
-  if (!session_name.empty())
+  if (!session_name.empty()) {
     AddItem(kDisabledCommandId, UTF8ToUTF16(session_name));
+    AddDeviceFavicon(GetItemCount() - 1, device_type);
+  }
 
   const TabNavigation& current_navigation =
       tab.navigations.at(tab.normalized_navigation_index());
   NavigationItem item(session_tag, tab.tab_id.id(),
                       current_navigation.virtual_url());
   int command_id = ModelIndexToCommandId(model_.size());
   AddItem(command_id, current_navigation.title());
-  AddFavicon(model_.size(), command_id, item.url);
+  AddTabFavicon(model_.size(), command_id, item.url);
   model_.push_back(item);
 }
 
-void RecentTabsSubMenuModel::AddFavicon(int model_index, int command_id,
-                                        const GURL& url) {
+void RecentTabsSubMenuModel::AddDeviceFavicon(
+    int index_in_menu,
+    browser_sync::SyncedSession::DeviceType device_type) {
+  int favicon_id = -1;
+  gfx::Image* favicon = NULL;
+  switch (device_type) {
+    case browser_sync::SyncedSession::TYPE_PHONE:
+      if ((favicon = &phone_favicon_)->IsEmpty())
+        favicon_id = IDR_PHONE_FAVICON;
+      break;
+
+    case browser_sync::SyncedSession::TYPE_TABLET:
+      if ((favicon = &tablet_favicon_)->IsEmpty())
+        favicon_id = IDR_TABLET_FAVICON;
+      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:
+      if ((favicon = &laptop_favicon_)->IsEmpty())
+        favicon_id = IDR_LAPTOP_FAVICON;
+      break;
+  };
+  DCHECK(favicon && (!favicon->IsEmpty() || favicon_id > -1));
+
+  if (favicon->IsEmpty()) {
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    *favicon = rb.GetNativeImageNamed(favicon_id);
+  }
+  SetIcon(index_in_menu, *favicon);
+}
+
+void RecentTabsSubMenuModel::AddTabFavicon(int model_index, int command_id,

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

nit: each param on its own line.

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

Done.

+                                           const GURL& url) {
+  int index_in_menu = GetIndexOfCommandId(command_id);
+
+  // If tab has synced favicon, use it.
+  browser_sync::SessionModelAssociator* associator = GetModelAssociator();
+  std::string favicon_png;
+  if (associator &&
+      associator->GetSyncedFaviconForPageURL(url.spec(), &favicon_png)) {
+    SetIcon(index_in_menu, gfx::Image(reinterpret_cast<const unsigned char*>(

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

You sure you need reinterpret cast here?

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

unfortunately yes, it won't build 'cos std::string::data() is const char*
whereas gfx::Image expects a const unsigned char*; it complains "invalid type"

+        favicon_png.data()), favicon_png.size()));
+    return;
+  }
+
+  // Otherwise, start to fetch the favicon from local history asynchronously.
   // Set default icon first.
-  SetIcon(GetIndexOfCommandId(command_id), default_favicon_);
+  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;
   FaviconService::Handle handle = favicon_service->GetFaviconImageForURL(
       FaviconService::FaviconForURLParams(browser_->profile(), url,
           history::FAVICON, gfx::kFaviconSize, &favicon_consumer_),
       base::Bind(&RecentTabsSubMenuModel::OnFaviconDataAvailable,
                  weak_ptr_factory_.GetWeakPtr()));
@@ skipping 21 matching lines @@
     RecentTabsSubMenuModel::GetModelAssociator() {
   if (!associator_) {
     ProfileSyncService* service = ProfileSyncServiceFactory::GetInstance()->
         GetForProfile(browser_->profile());
     // Only return the associator if it exists and it is done syncing sessions.
     if (service && service->ShouldPushChanges())
       associator_ = service->GetSessionModelAssociator();
   }
   return associator_;
 }