Alternate NTP: Limit width of tab titles in recent tabs menu

chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.cc

 // Copyright (c) 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_builder_test_helper.h"
 
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
@@ skipping 38 matching lines @@
 }
 
 std::string ToTabUrl(SessionID::id_type session_id,
                      SessionID::id_type window_id,
                      SessionID::id_type tab_id) {
   return std::string(kBaseTabUrl + ToTabTitle(session_id, window_id, tab_id));
 }
 
 }  // namespace
 
+struct RecentTabsBuilderTestHelper::TabInfo {
+  SessionID::id_type id;

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

Add constructor to initialize id.

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

Done.

+  base::Time timestamp;
+  string16 title;
+};
+struct RecentTabsBuilderTestHelper::WindowInfo {
+  WindowInfo() {}

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

initialize id.

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

Done.

+  ~WindowInfo() {}
+  SessionID::id_type id;
+  std::vector<TabInfo> tabs;
+};
+struct RecentTabsBuilderTestHelper::SessionInfo {
+  SessionInfo() {}

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

initialize id.

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

Done.

+  ~SessionInfo() {}
+  SessionID::id_type id;
+  std::vector<WindowInfo> windows;
+};
+
 RecentTabsBuilderTestHelper::RecentTabsBuilderTestHelper() {
   start_time_ = base::Time::Now();
 }
 
 RecentTabsBuilderTestHelper::~RecentTabsBuilderTestHelper() {
 }
 
 void RecentTabsBuilderTestHelper::AddSession() {
   SessionInfo info;
   info.id = CreateUniqueID();
@@ skipping 34 matching lines @@
 }
 
 SessionID::id_type RecentTabsBuilderTestHelper::GetWindowID(int session_index,
                                                             int window_index) {
   return sessions_[session_index].windows[window_index].id;
 }
 
 void RecentTabsBuilderTestHelper::AddTab(int session_index, int window_index) {
   base::Time timestamp =
       start_time_ + base::TimeDelta::FromMinutes(base::RandUint64());
-  AddTabWithTimestamp(session_index, window_index, timestamp);
+  AddTabWithInfo(session_index, window_index, timestamp, string16());
 }
 
-void RecentTabsBuilderTestHelper::AddTabWithTimestamp(int session_index,
-                                                      int window_index,
-                                                      base::Time timestamp) {
+void RecentTabsBuilderTestHelper::AddTabWithInfo(int session_index,
+                                                 int window_index,
+                                                 base::Time timestamp,
+                                                 const string16& title) {
   TabInfo tab_info;
   tab_info.id = CreateUniqueID();
   tab_info.timestamp = timestamp;
+  tab_info.title = title;
   sessions_[session_index].windows[window_index].tabs.push_back(tab_info);
 }
 
 int RecentTabsBuilderTestHelper::GetTabCount(int session_index,
                                              int window_index) {
   return sessions_[session_index].windows[window_index].tabs.size();
 }
 
 SessionID::id_type RecentTabsBuilderTestHelper::GetTabID(int session_index,
                                                          int window_index,
                                                          int tab_index) {
   return sessions_[session_index].windows[window_index].tabs[tab_index].id;
 }
 
 base::Time RecentTabsBuilderTestHelper::GetTabTimestamp(int session_index,
                                                         int window_index,
                                                         int tab_index) {
   return sessions_[session_index].windows[window_index]
       .tabs[tab_index].timestamp;
 }
 
+string16 RecentTabsBuilderTestHelper::GetTabTitle(int session_index,
+                                                  int window_index,
+                                                  int tab_index) {
+  string16 title =
+      sessions_[session_index].windows[window_index].tabs[tab_index].title;
+  if (title.empty()) {
+    title = UTF8ToUTF16(ToTabTitle(
+        GetSessionID(session_index),
+        GetWindowID(session_index, window_index),
+        GetTabID(session_index, window_index, tab_index)));
+  }
+  return title;
+}
+
 void RecentTabsBuilderTestHelper::RegisterRecentTabs(
     browser_sync::SessionModelAssociator* associator) {
   for (int s = 0; s < GetSessionCount(); ++s) {
     sync_pb::SessionSpecifics meta;
     BuildSessionSpecifics(s, &meta);
     for (int w = 0; w < GetWindowCount(s); ++w) {
       BuildWindowSpecifics(s, w, &meta);
       for (int t = 0; t < GetTabCount(s, w); ++t) {
         sync_pb::SessionSpecifics tab_base;
         BuildTabSpecifics(s, w, t, &tab_base);
@@ skipping 18 matching lines @@
   }
 }
 
 std::vector<string16>
 RecentTabsBuilderTestHelper::GetTabTitlesSortedByRecency() {
   std::vector<TitleTimestampPair> tabs;
   for (int s = 0; s < GetSessionCount(); ++s) {
     for (int w = 0; w < GetWindowCount(s); ++w) {
       for (int t = 0; t < GetTabCount(s, w); ++t) {
         TitleTimestampPair pair;
-        pair.title = UTF8ToUTF16(ToTabTitle(
-            GetSessionID(s), GetWindowID(s, w), GetTabID(s, w, t)));
+        pair.title = GetTabTitle(s, w, t);
         pair.timestamp = GetTabTimestamp(s, w, t);
         tabs.push_back(pair);
       }
     }
   }
   sort(tabs.begin(), tabs.end(), SortTabTimesByRecency);
 
   std::vector<string16> titles;
   for (size_t i = 0; i < tabs.size(); ++i)
     titles.push_back(tabs[i].title);
@@ skipping 37 matching lines @@
   sync_pb::SessionTab* tab = tab_base->mutable_tab();
   tab->set_window_id(window_id);
   tab->set_tab_id(tab_id);
   tab->set_tab_visual_index(1);
   tab->set_current_navigation_index(0);
   tab->set_pinned(true);
   tab->set_extension_app_id("app_id");
   sync_pb::TabNavigation* navigation = tab->add_navigation();
   navigation->set_virtual_url(ToTabUrl(session_id, window_id, tab_id));
   navigation->set_referrer("referrer");
-  navigation->set_title(ToTabTitle(session_id, window_id, tab_id));
+  navigation->set_title(UTF16ToUTF8(GetTabTitle(
+      session_index, window_index, tab_index)));
   navigation->set_page_transition(sync_pb::SyncEnums_PageTransition_TYPED);
 }
-
-RecentTabsBuilderTestHelper::WindowInfo::WindowInfo() {}
-
-RecentTabsBuilderTestHelper::WindowInfo::~WindowInfo() {}
-
-RecentTabsBuilderTestHelper::SessionInfo::SessionInfo() {}
-
-RecentTabsBuilderTestHelper::SessionInfo::~SessionInfo() {}