X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fui%2Fviews%2Fbookmarks%2Fbookmark_menu_controller_views.cc;h=b02c31c02b8315b60c3101c713269a39a02cf871;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=6b21763f0dede00ab0ec849af2912c63afe644a2;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/src/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index 6b21763..b02c31c 100644 --- a/src/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/src/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc @@ -7,12 +7,12 @@ #include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_stats.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_observer.h" #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" #include "chrome/common/pref_names.h" +#include "components/bookmarks/core/browser/bookmark_model.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/user_metrics.h" #include "grit/generated_resources.h" @@ -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_)