diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 07:50:35 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 07:50:35 +0000 |
| commit | fd6c0a60b699d6dd924a296b6c97cabdb0138140 (patch) | |
| tree | e89700ef72606d09cec943154af7dfae36e90eb2 /ash/shell_unittest.cc | |
| parent | 530a52a317f97cc37d0482edbc0de6033450b2da (diff) | |
| download | chromium_src-fd6c0a60b699d6dd924a296b6c97cabdb0138140.zip chromium_src-fd6c0a60b699d6dd924a296b6c97cabdb0138140.tar.gz chromium_src-fd6c0a60b699d6dd924a296b6c97cabdb0138140.tar.bz2 | |
Move enum MenuAnchorPosition to reduce deps on menu_item_view.h
[Menu]AnchorPosition is used by the MenuRunner and other APIs. Having
the enum nested in MenuItemView means that a lot of files must depend on
menu_item_view.h, even if they are just using a MenuRunner created with
a MenuModel (rather than a MenuItemView).
This CL moves the MenuItemView::AnchorPosition enum to
views::MenuAnchorPosition in menu_types.h. This allows the
menu_item_view.h dependency to be removed from a lot of places
(directly, and transitively by removing menu_item_view.h includes from
any header files).
BUG=366007, 363889
TBR=pfeldman@chromium.org
Review URL: https://codereview.chromium.org/250943008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 5c206a5..59344ce 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -380,9 +380,12 @@ TEST_F(ShellTest, LockScreenClosesActiveMenu) { base::Unretained(this))); EXPECT_EQ(views::MenuRunner::NORMAL_EXIT, - menu_runner->RunMenuAt(widget, NULL, gfx::Rect(), - views::MenuItemView::TOPLEFT, ui::MENU_SOURCE_MOUSE, - views::MenuRunner::CONTEXT_MENU)); + menu_runner->RunMenuAt(widget, + NULL, + gfx::Rect(), + views::MENU_ANCHOR_TOPLEFT, + ui::MENU_SOURCE_MOUSE, + views::MenuRunner::CONTEXT_MENU)); } TEST_F(ShellTest, ManagedWindowModeBasics) { |