Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2116)

Unified Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

Issue 1182493009: Wrench menu reorg phase 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge error Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
index f0782c8cadeb0bc1549b1d7b78bc4835409fd847..b337b2bf63f652f752976ef543eb8306f890190c 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
@@ -198,25 +198,28 @@ TEST_F(WrenchMenuControllerTest, RecentTabsElideTitle) {
EXPECT_TRUE(recent_tabs_menu);
EXPECT_EQ(7, [recent_tabs_menu numberOfItems]);
- // Index 0: restore tabs menu item.
- NSString* restore_tab_label = l10n_util::FixUpWindowsStyleLabel(
- recent_tabs_sub_menu_model.GetLabelAt(0));
- EXPECT_NSEQ(restore_tab_label, [[recent_tabs_menu itemAtIndex:0] title]);
-
// Item 1: separator.
EXPECT_TRUE([[recent_tabs_menu itemAtIndex:1] isSeparatorItem]);
- // Item 2: window title.
+ // Index 2: restore tabs menu item.
+ NSString* restore_tab_label = l10n_util::FixUpWindowsStyleLabel(
+ recent_tabs_sub_menu_model.GetLabelAt(2));
+ EXPECT_NSEQ(restore_tab_label, [[recent_tabs_menu itemAtIndex:2] title]);
+
+ // Item 3: separator.
+ EXPECT_TRUE([[recent_tabs_menu itemAtIndex:3] isSeparatorItem]);
+
+ // Item 4: window title.
EXPECT_NSEQ(
- base::SysUTF16ToNSString(recent_tabs_sub_menu_model.GetLabelAt(2)),
- [[recent_tabs_menu itemAtIndex:2] title]);
+ base::SysUTF16ToNSString(recent_tabs_sub_menu_model.GetLabelAt(4)),
+ [[recent_tabs_menu itemAtIndex:4] title]);
- // Item 3: short tab title.
+ // Item 5: short tab title.
EXPECT_NSEQ(base::SysUTF16ToNSString(tab1_short_title),
- [[recent_tabs_menu itemAtIndex:3] title]);
+ [[recent_tabs_menu itemAtIndex:5] title]);
- // Item 4: long tab title.
- NSString* tab2_actual_title = [[recent_tabs_menu itemAtIndex:4] title];
+ // Item 6: long tab title.
+ NSString* tab2_actual_title = [[recent_tabs_menu itemAtIndex:6] title];
NSUInteger title_length = [tab2_actual_title length];
EXPECT_GT(tab2_long_title.size(), title_length);
NSString* actual_substring =
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698