Index: chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc |
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc |
index d8d5204575afe9a1a9644f67fa4f559b63d30c57..19c241e740777dd093e70c9ca6cab292492abdf0 100644 |
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc |
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc |
@@ -149,6 +149,8 @@ bool RecentTabsSubMenuModel::IsCommandIdEnabled(int command_id) const { |
if (command_id == kDisabledCommandId || |
command_id == IDC_RECENT_TABS_NO_DEVICE_TABS) { |
return false; |
+ } else if (command_id == IDC_RECENT_TABS_DEVICES_AND_HISTORY) { |
+ return true; |
} |
int model_index = CommandIdToModelIndex(command_id); |
return model_index >= 0 && model_index < static_cast<int>(model_.size()); |
@@ -188,6 +190,11 @@ void RecentTabsSubMenuModel::ExecuteCommand(int command_id, int event_flags) { |
chrome::ExecuteCommandWithDisposition(browser_, command_id, |
ui::DispositionFromEventFlags(event_flags)); |
return; |
+ } else if (command_id == IDC_RECENT_TABS_DEVICES_AND_HISTORY) { |
+ // We show all "other devices" on the history page. |
+ chrome::ExecuteCommandWithDisposition(browser_, IDC_SHOW_HISTORY, |
+ ui::DispositionFromEventFlags(event_flags)); |
+ return; |
} |
DCHECK_NE(kDisabledCommandId, command_id); |
@@ -269,9 +276,8 @@ void RecentTabsSubMenuModel::BuildDevices() { |
const size_t kMaxSessionsToShow = 3; |
size_t num_sessions_added = 0; |
- for (size_t i = 0; |
- i < sessions.size() && num_sessions_added < kMaxSessionsToShow; |
- ++i) { |
+ size_t i = 0; |
+ for (; i < sessions.size() && num_sessions_added < kMaxSessionsToShow; ++i) { |
const browser_sync::SyncedSession* session = sessions[i]; |
const std::string& session_tag = session->session_tag; |
@@ -322,6 +328,10 @@ void RecentTabsSubMenuModel::BuildDevices() { |
++num_sessions_added; |
} // for all sessions |
+ |
+ AddSeparator(ui::NORMAL_SEPARATOR); |
+ AddItemWithStringId(IDC_RECENT_TABS_DEVICES_AND_HISTORY, |
+ IDS_RECENT_TABS_DEVICES_AND_HISTORY); |
} |
void RecentTabsSubMenuModel::BuildForeignTabItem( |