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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc

Issue 10827271: Replace views::Event with ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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/views/bookmarks/bookmark_menu_delegate.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/bookmarks/bookmark_model.h" 8 #include "chrome/browser/bookmarks/bookmark_model.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/bookmarks/bookmark_node_data.h" 10 #include "chrome/browser/bookmarks/bookmark_node_data.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 DCHECK(i != menu_id_to_node_map_.end()); 108 DCHECK(i != menu_id_to_node_map_.end());
109 const BookmarkNode* node = i->second; 109 const BookmarkNode* node = i->second;
110 if (node->is_url()) { 110 if (node->is_url()) {
111 return BookmarkBarView::CreateToolTipForURLAndTitle( 111 return BookmarkBarView::CreateToolTipForURLAndTitle(
112 screen_loc, node->url(), node->GetTitle(), profile_); 112 screen_loc, node->url(), node->GetTitle(), profile_);
113 } 113 }
114 return string16(); 114 return string16();
115 } 115 }
116 116
117 bool BookmarkMenuDelegate::IsTriggerableEvent(views::MenuItemView* menu, 117 bool BookmarkMenuDelegate::IsTriggerableEvent(views::MenuItemView* menu,
118 const views::Event& e) { 118 const ui::Event& e) {
119 return e.type() == ui::ET_GESTURE_TAP || 119 return e.type() == ui::ET_GESTURE_TAP ||
120 e.type() == ui::ET_GESTURE_TAP_DOWN || 120 e.type() == ui::ET_GESTURE_TAP_DOWN ||
121 event_utils::IsPossibleDispositionEvent(e); 121 event_utils::IsPossibleDispositionEvent(e);
122 } 122 }
123 123
124 void BookmarkMenuDelegate::ExecuteCommand(int id, int mouse_event_flags) { 124 void BookmarkMenuDelegate::ExecuteCommand(int id, int mouse_event_flags) {
125 DCHECK(menu_id_to_node_map_.find(id) != menu_id_to_node_map_.end()); 125 DCHECK(menu_id_to_node_map_.find(id) != menu_id_to_node_map_.end());
126 126
127 const BookmarkNode* node = menu_id_to_node_map_[id]; 127 const BookmarkNode* node = menu_id_to_node_map_[id];
128 std::vector<const BookmarkNode*> selection; 128 std::vector<const BookmarkNode*> selection;
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) { 491 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) {
492 for (NodeToMenuMap::const_iterator i(node_to_menu_map_.begin()); 492 for (NodeToMenuMap::const_iterator i(node_to_menu_map_.begin());
493 i != node_to_menu_map_.end(); ++i) { 493 i != node_to_menu_map_.end(); ++i) {
494 MenuItemView* menu = i->second->GetMenuItemByID(id); 494 MenuItemView* menu = i->second->GetMenuItemByID(id);
495 if (menu) 495 if (menu)
496 return menu; 496 return menu;
497 } 497 }
498 498
499 return parent_menu_item_ ? parent_menu_item_->GetMenuItemByID(id) : NULL; 499 return parent_menu_item_ ? parent_menu_item_->GetMenuItemByID(id) : NULL;
500 } 500 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h ('k') | chrome/browser/ui/views/browser_action_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698