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

Side by Side Diff: chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc

Issue 117903006: Refactor: Makes menus use gfx::FontList instead of gfx::Font. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" 5 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/sessions/session_service.h" 10 #include "chrome/browser/sessions/session_service.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 // 0 Recently closed header (disabled) 201 // 0 Recently closed header (disabled)
202 // 1 <separator> 202 // 1 <separator>
203 // 2 No tabs from other Devices 203 // 2 No tabs from other Devices
204 204
205 int num_items = model.GetItemCount(); 205 int num_items = model.GetItemCount();
206 EXPECT_EQ(3, num_items); 206 EXPECT_EQ(3, num_items);
207 EXPECT_FALSE(model.IsEnabledAt(0)); 207 EXPECT_FALSE(model.IsEnabledAt(0));
208 EXPECT_FALSE(model.IsEnabledAt(2)); 208 EXPECT_FALSE(model.IsEnabledAt(2));
209 EXPECT_EQ(0, model.enable_count()); 209 EXPECT_EQ(0, model.enable_count());
210 210
211 EXPECT_EQ(NULL, model.GetLabelFontAt(0)); 211 EXPECT_EQ(NULL, model.GetLabelFontListAt(0));
212 EXPECT_EQ(NULL, model.GetLabelFontAt(1)); 212 EXPECT_EQ(NULL, model.GetLabelFontListAt(1));
213 EXPECT_EQ(NULL, model.GetLabelFontAt(2)); 213 EXPECT_EQ(NULL, model.GetLabelFontListAt(2));
214 214
215 std::string url; 215 std::string url;
216 base::string16 title; 216 base::string16 title;
217 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title)); 217 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title));
218 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(1, &url, &title)); 218 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(1, &url, &title));
219 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(2, &url, &title)); 219 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(2, &url, &title));
220 } 220 }
221 221
222 // Test enabled "Recently closed" header with no foreign tabs. 222 // Test enabled "Recently closed" header with no foreign tabs.
223 TEST_F(RecentTabsSubMenuModelTest, RecentlyClosedTabsFromCurrentSession) { 223 TEST_F(RecentTabsSubMenuModelTest, RecentlyClosedTabsFromCurrentSession) {
(...skipping 18 matching lines...) Expand all
242 EXPECT_EQ(5, num_items); 242 EXPECT_EQ(5, num_items);
243 EXPECT_FALSE(model.IsEnabledAt(0)); 243 EXPECT_FALSE(model.IsEnabledAt(0));
244 EXPECT_TRUE(model.IsEnabledAt(1)); 244 EXPECT_TRUE(model.IsEnabledAt(1));
245 EXPECT_TRUE(model.IsEnabledAt(2)); 245 EXPECT_TRUE(model.IsEnabledAt(2));
246 model.ActivatedAt(1); 246 model.ActivatedAt(1);
247 model.ActivatedAt(2); 247 model.ActivatedAt(2);
248 EXPECT_FALSE(model.IsEnabledAt(4)); 248 EXPECT_FALSE(model.IsEnabledAt(4));
249 EXPECT_EQ(2, model.enable_count()); 249 EXPECT_EQ(2, model.enable_count());
250 EXPECT_EQ(2, model.execute_count()); 250 EXPECT_EQ(2, model.execute_count());
251 251
252 EXPECT_TRUE(model.GetLabelFontAt(0) != NULL); 252 EXPECT_TRUE(model.GetLabelFontListAt(0) != NULL);
253 EXPECT_EQ(NULL, model.GetLabelFontAt(1)); 253 EXPECT_EQ(NULL, model.GetLabelFontListAt(1));
254 EXPECT_EQ(NULL, model.GetLabelFontAt(2)); 254 EXPECT_EQ(NULL, model.GetLabelFontListAt(2));
255 EXPECT_EQ(NULL, model.GetLabelFontAt(3)); 255 EXPECT_EQ(NULL, model.GetLabelFontListAt(3));
256 EXPECT_EQ(NULL, model.GetLabelFontAt(4)); 256 EXPECT_EQ(NULL, model.GetLabelFontListAt(4));
257 257
258 std::string url; 258 std::string url;
259 base::string16 title; 259 base::string16 title;
260 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title)); 260 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title));
261 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(1, &url, &title)); 261 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(1, &url, &title));
262 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(2, &url, &title)); 262 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(2, &url, &title));
263 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(3, &url, &title)); 263 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(3, &url, &title));
264 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(4, &url, &title)); 264 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(4, &url, &title));
265 } 265 }
266 266
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 EXPECT_TRUE(model.IsEnabledAt(2)); 352 EXPECT_TRUE(model.IsEnabledAt(2));
353 EXPECT_TRUE(model.IsEnabledAt(3)); 353 EXPECT_TRUE(model.IsEnabledAt(3));
354 model.ActivatedAt(1); 354 model.ActivatedAt(1);
355 model.ActivatedAt(2); 355 model.ActivatedAt(2);
356 model.ActivatedAt(3); 356 model.ActivatedAt(3);
357 EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR, model.GetTypeAt(4)); 357 EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR, model.GetTypeAt(4));
358 EXPECT_FALSE(model.IsEnabledAt(5)); 358 EXPECT_FALSE(model.IsEnabledAt(5));
359 EXPECT_EQ(3, model.enable_count()); 359 EXPECT_EQ(3, model.enable_count());
360 EXPECT_EQ(3, model.execute_count()); 360 EXPECT_EQ(3, model.execute_count());
361 361
362 EXPECT_TRUE(model.GetLabelFontAt(0) != NULL); 362 EXPECT_TRUE(model.GetLabelFontListAt(0) != NULL);
363 EXPECT_EQ(NULL, model.GetLabelFontAt(1)); 363 EXPECT_EQ(NULL, model.GetLabelFontListAt(1));
364 EXPECT_EQ(NULL, model.GetLabelFontAt(2)); 364 EXPECT_EQ(NULL, model.GetLabelFontListAt(2));
365 EXPECT_EQ(NULL, model.GetLabelFontAt(3)); 365 EXPECT_EQ(NULL, model.GetLabelFontListAt(3));
366 EXPECT_EQ(NULL, model.GetLabelFontAt(4)); 366 EXPECT_EQ(NULL, model.GetLabelFontListAt(4));
367 EXPECT_EQ(NULL, model.GetLabelFontAt(5)); 367 EXPECT_EQ(NULL, model.GetLabelFontListAt(5));
368 368
369 std::string url; 369 std::string url;
370 base::string16 title; 370 base::string16 title;
371 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title)); 371 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title));
372 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(1, &url, &title)); 372 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(1, &url, &title));
373 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(2, &url, &title)); 373 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(2, &url, &title));
374 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(3, &url, &title)); 374 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(3, &url, &title));
375 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(4, &url, &title)); 375 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(4, &url, &title));
376 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(5, &url, &title)); 376 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(5, &url, &title));
377 } 377 }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 model.ActivatedAt(8); 436 model.ActivatedAt(8);
437 EXPECT_TRUE(model.IsEnabledAt(8)); 437 EXPECT_TRUE(model.IsEnabledAt(8));
438 model.ActivatedAt(9); 438 model.ActivatedAt(9);
439 EXPECT_TRUE(model.IsEnabledAt(9)); 439 EXPECT_TRUE(model.IsEnabledAt(9));
440 model.ActivatedAt(10); 440 model.ActivatedAt(10);
441 EXPECT_TRUE(model.IsEnabledAt(10)); 441 EXPECT_TRUE(model.IsEnabledAt(10));
442 EXPECT_TRUE(model.IsEnabledAt(12)); 442 EXPECT_TRUE(model.IsEnabledAt(12));
443 EXPECT_EQ(7, model.enable_count()); 443 EXPECT_EQ(7, model.enable_count());
444 EXPECT_EQ(7, model.execute_count()); 444 EXPECT_EQ(7, model.execute_count());
445 445
446 EXPECT_EQ(NULL, model.GetLabelFontAt(0)); 446 EXPECT_EQ(NULL, model.GetLabelFontListAt(0));
447 EXPECT_EQ(NULL, model.GetLabelFontAt(1)); 447 EXPECT_EQ(NULL, model.GetLabelFontListAt(1));
448 EXPECT_TRUE(model.GetLabelFontAt(2) != NULL); 448 EXPECT_TRUE(model.GetLabelFontListAt(2) != NULL);
449 EXPECT_EQ(NULL, model.GetLabelFontAt(3)); 449 EXPECT_EQ(NULL, model.GetLabelFontListAt(3));
450 EXPECT_EQ(NULL, model.GetLabelFontAt(4)); 450 EXPECT_EQ(NULL, model.GetLabelFontListAt(4));
451 EXPECT_EQ(NULL, model.GetLabelFontAt(5)); 451 EXPECT_EQ(NULL, model.GetLabelFontListAt(5));
452 EXPECT_EQ(NULL, model.GetLabelFontAt(6)); 452 EXPECT_EQ(NULL, model.GetLabelFontListAt(6));
453 EXPECT_TRUE(model.GetLabelFontAt(7) != NULL); 453 EXPECT_TRUE(model.GetLabelFontListAt(7) != NULL);
454 EXPECT_EQ(NULL, model.GetLabelFontAt(8)); 454 EXPECT_EQ(NULL, model.GetLabelFontListAt(8));
455 EXPECT_EQ(NULL, model.GetLabelFontAt(9)); 455 EXPECT_EQ(NULL, model.GetLabelFontListAt(9));
456 EXPECT_EQ(NULL, model.GetLabelFontAt(10)); 456 EXPECT_EQ(NULL, model.GetLabelFontListAt(10));
457 EXPECT_EQ(NULL, model.GetLabelFontAt(11)); 457 EXPECT_EQ(NULL, model.GetLabelFontListAt(11));
458 EXPECT_EQ(NULL, model.GetLabelFontAt(12)); 458 EXPECT_EQ(NULL, model.GetLabelFontListAt(12));
459 459
460 std::string url; 460 std::string url;
461 base::string16 title; 461 base::string16 title;
462 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title)); 462 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title));
463 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(1, &url, &title)); 463 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(1, &url, &title));
464 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(2, &url, &title)); 464 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(2, &url, &title));
465 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(3, &url, &title)); 465 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(3, &url, &title));
466 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(4, &url, &title)); 466 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(4, &url, &title));
467 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(5, &url, &title)); 467 EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(5, &url, &title));
468 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(6, &url, &title)); 468 EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(6, &url, &title));
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 // 0 Recently closed heaer (disabled) 579 // 0 Recently closed heaer (disabled)
580 // 1 <separator> 580 // 1 <separator>
581 // 2 No tabs from other Devices 581 // 2 No tabs from other Devices
582 582
583 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); 583 TestRecentTabsSubMenuModel model(NULL, browser(), NULL);
584 EXPECT_EQ(3, model.GetItemCount()); 584 EXPECT_EQ(3, model.GetItemCount());
585 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(0)); 585 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(0));
586 EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(1)); 586 EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(1));
587 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2)); 587 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2));
588 } 588 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698