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

Side by Side Diff: ui/views/controls/menu/menu_item_view_unittest.cc

Issue 553233002: Dynamically calculate the number of extension icons to show per row in overflow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « ui/views/controls/menu/menu_item_view.cc ('k') | ui/views/controls/menu/submenu_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "ui/views/controls/menu/menu_item_view.h"
6
7 #include "base/strings/string16.h"
8 #include "base/strings/utf_string_conversions.h"
9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/views/controls/menu/submenu_view.h"
11 #include "ui/views/view.h"
12
13 namespace {
14
15 // A simple View class that will match its height to the available width.
16 class SquareView : public views::View {
17 public:
18 SquareView() {}
19 virtual ~SquareView() {}
20
21 private:
22 virtual gfx::Size GetPreferredSize() const OVERRIDE {
23 return gfx::Size(1, 1);
24 }
25 virtual int GetHeightForWidth(int width) const OVERRIDE {
26 return width;
27 }
28 };
29
30 // A MenuItemView implementation with a public destructor (so we can clean up
31 // in tests).
32 class TestMenuItemView : public views::MenuItemView {
33 public:
34 TestMenuItemView() : views::MenuItemView(NULL) {}
35 virtual ~TestMenuItemView() {}
36 };
37
38 } // namespace
39
40 TEST(MenuItemViewUnitTest, TestMenuItemViewWithFlexibleWidthChild) {
41 TestMenuItemView root_menu;
42 root_menu.set_owned_by_client();
43
44 // Append a normal MenuItemView.
45 views::MenuItemView* label_view =
46 root_menu.AppendMenuItemWithLabel(1, base::ASCIIToUTF16("item 1"));
47
48 // Append a second MenuItemView that has a child SquareView.
49 views::MenuItemView* flexible_view =
50 root_menu.AppendMenuItemWithLabel(2, base::string16());
51 flexible_view->AddChildView(new SquareView());
52 // Set margins to 0 so that we know width should match height.
53 flexible_view->SetMargins(0, 0);
54
55 views::SubmenuView* submenu = root_menu.GetSubmenu();
56
57 // The first item should be the label view.
58 ASSERT_EQ(label_view, submenu->GetMenuItemAt(0));
59 gfx::Size label_size = label_view->GetPreferredSize();
60
61 // The second item should be the flexible view.
62 ASSERT_EQ(flexible_view, submenu->GetMenuItemAt(1));
63 gfx::Size flexible_size = flexible_view->GetPreferredSize();
64
65 // The flexible view's "preferred size" should be 1x1...
66 EXPECT_EQ(flexible_size, gfx::Size(1, 1));
67
68 // ...but it should use whatever space is available to make a square.
69 int flex_height = flexible_view->GetHeightForWidth(label_size.width());
70 EXPECT_EQ(label_size.width(), flex_height);
71
72 // The submenu should be tall enough to allow for both menu items at the given
73 // width.
74 EXPECT_EQ(label_size.height() + flex_height,
75 submenu->GetPreferredSize().height());
76 }
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_item_view.cc ('k') | ui/views/controls/menu/submenu_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698