chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc - Issue 250943008: Move enum MenuAnchorPosition to reduce deps on menu_item_view.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc

Issue 250943008: Move enum MenuAnchorPosition to reduce deps on menu_item_view.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix indent Created 6 years, 8 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/browser/ui/views/bookmarks/bookmark_menu_controller_views.h ('k') | chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc

diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc

index ea92b7764e4c51599a8e882d138ea807ea6f7d8b..b02c31c02b8315b60c3101c713269a39a02cf871 100644

--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc

+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc

@@ -21,6 +21,7 @@

#include "ui/base/dragdrop/os_exchange_data.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/views/controls/button/menu_button.h"

+#include "ui/views/controls/menu/menu_item_view.h"

#include "ui/views/controls/menu/menu_runner.h"

#include "ui/views/widget/widget.h"

@@ -51,7 +52,7 @@ void BookmarkMenuController::RunMenuAt(BookmarkBarView* bookmark_bar,

bookmark_bar_ = bookmark_bar;

views::MenuButton* menu_button = bookmark_bar_->GetMenuButtonForNode(node_);

DCHECK(menu_button);

- MenuItemView::AnchorPosition anchor;

+ views::MenuAnchorPosition anchor;

bookmark_bar_->GetAnchorPositionForButton(menu_button, &anchor);

gfx::Point screen_loc;

views::View::ConvertPointToScreen(menu_button, &screen_loc);

@@ -163,7 +164,7 @@ int BookmarkMenuController::GetDragOperations(MenuItemView* sender) {

views::MenuItemView* BookmarkMenuController::GetSiblingMenu(

views::MenuItemView* menu,

const gfx::Point& screen_point,

- views::MenuItemView::AnchorPosition* anchor,

+ views::MenuAnchorPosition* anchor,

bool* has_mnemonics,

views::MenuButton** button) {

if (!bookmark_bar_ || for_drop_)