Alternate NTP: Limit width of tab titles in 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"
@@ skipping 129 matching lines @@
 RecentTabsSubMenuModel::~RecentTabsSubMenuModel() {
 }
 
 bool RecentTabsSubMenuModel::IsCommandIdChecked(int command_id) const {
   return false;
 }
 
 bool RecentTabsSubMenuModel::IsCommandIdEnabled(int command_id) const {
   if (command_id == IDC_RESTORE_TAB)
     return chrome::IsCommandEnabled(browser_, command_id);
-  if (command_id == kDisabledCommandId)
+  if (command_id == kDisabledCommandId ||
+      command_id == IDC_RECENT_TABS_NO_DEVICE_TABS) {
     return false;
+  }
   int model_index = CommandIdToModelIndex(command_id);
   return model_index >= 0 && model_index < static_cast<int>(model_.size());
 }
 
 bool RecentTabsSubMenuModel::GetAcceleratorForCommandId(
     int command_id, ui::Accelerator* accelerator) {
   if (command_id == IDC_RESTORE_TAB &&
       reopen_closed_tab_accelerator_.key_code() != ui::VKEY_UNKNOWN) {
     *accelerator = reopen_closed_tab_accelerator_;
     return true;
@@ skipping 24 matching lines @@
   ExecuteCommand(command_id, 0);
 }
 
 void RecentTabsSubMenuModel::ExecuteCommand(int command_id, int event_flags) {
   if (command_id == IDC_RESTORE_TAB) {
     chrome::ExecuteCommandWithDisposition(browser_, command_id,
         chrome::DispositionFromEventFlags(event_flags));
     return;
   }
 
-  DCHECK(command_id != kDisabledCommandId);
+  DCHECK_NE(kDisabledCommandId, command_id);
+  DCHECK_NE(IDC_RECENT_TABS_NO_DEVICE_TABS, command_id);
+
   int model_idx = CommandIdToModelIndex(command_id);
   DCHECK(model_idx >= 0 && model_idx < static_cast<int>(model_.size()));
   const NavigationItem& item = model_[model_idx];
   DCHECK(item.tab_id > -1 && item.url.is_valid());
 
   WindowOpenDisposition disposition =
       chrome::DispositionFromEventFlags(event_flags);
   if (disposition == CURRENT_TAB)  // Force to open a new foreground tab.
     disposition = NEW_FOREGROUND_TAB;
 
@@ skipping 19 matching lines @@
       return;
     int prev_num_tabs = browser_->tab_strip_model()->count();
     SessionRestore::RestoreForeignSessionTab(
         chrome::GetActiveWebContents(browser_), *tab, disposition);
     // If tab is successfully added (i.e. there's 1 more tab), select it.
     if (browser_->tab_strip_model()->count() == prev_num_tabs + 1)
       chrome::SelectNextTab(browser_);
   }
 }
 
+int RecentTabsSubMenuModel::GetMaxWidthForItemAtIndex(int item_index) const {

[sky, 2012/11/28 15:41:28]

Is there a reason for the method instead of a constant?

[sail, 2012/11/30 23:24:53]

Some of the items in this menu should be elided but some shouldn't.

This logic is contained inside this function (the if statement below).

By having this logic in this class we can share it with all platforms. Currently
only the Mac code calls this but eventually the Views code will call this as
well.

[kuan, 2012/11/30 23:40:59]

is it possible to make this a static method that takes in a command_id ?  that
way, the caller doesn't need to static_cast the |MenuModel| to
|RecentTabsSubMenuModel|  to use this method.

+  int command_id = GetCommandIdAt(item_index);
+  if (command_id == IDC_RECENT_TABS_NO_DEVICE_TABS ||
+      command_id == IDC_RESTORE_TAB) {
+    return -1;
+  }
+  return 320;
+}
+
 void RecentTabsSubMenuModel::Build() {
   // The menu contains:
   // - Reopen closed tab, then separator
   // - device 1 section header, then list of tabs from device, then separator
   // - device 2 section header, then list of tabs from device, then separator
   // ...
   // |model_| only contains navigatable (and hence executable) tab items for
   // other devices.
   BuildLastClosed();
   BuildDevices();
-  if (model_.empty())
-    AddItemWithStringId(kDisabledCommandId, IDS_RECENT_TABS_NO_DEVICE_TABS);
+  if (model_.empty()) {
+    AddItemWithStringId(IDC_RECENT_TABS_NO_DEVICE_TABS,
+                        IDS_RECENT_TABS_NO_DEVICE_TABS);
+  }
 }
 
 void RecentTabsSubMenuModel::BuildLastClosed() {
   AddItem(IDC_RESTORE_TAB, GetLabelForCommandId(IDC_RESTORE_TAB));
   AddSeparator(ui::NORMAL_SEPARATOR);
 }
 
 void RecentTabsSubMenuModel::BuildDevices() {
   browser_sync::SessionModelAssociator* associator = GetModelAssociator();
   if (!associator)
@@ skipping 169 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_;
 }