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

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

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo in elide_url.cc Created 4 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 unified diff | Download patch
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/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" 10 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 MenuIDToNodeMap::const_iterator i = menu_id_to_node_map_.find(id); 140 MenuIDToNodeMap::const_iterator i = menu_id_to_node_map_.find(id);
141 // When removing bookmarks it may be possible to end up here without a node. 141 // When removing bookmarks it may be possible to end up here without a node.
142 if (i == menu_id_to_node_map_.end()) { 142 if (i == menu_id_to_node_map_.end()) {
143 DCHECK(is_mutating_model_); 143 DCHECK(is_mutating_model_);
144 return base::string16(); 144 return base::string16();
145 } 145 }
146 146
147 const BookmarkNode* node = i->second; 147 const BookmarkNode* node = i->second;
148 if (node->is_url()) { 148 if (node->is_url()) {
149 return BookmarkBarView::CreateToolTipForURLAndTitle( 149 return BookmarkBarView::CreateToolTipForURLAndTitle(
150 parent_, screen_loc, node->url(), node->GetTitle(), profile_); 150 parent_, screen_loc, node->url(), node->GetTitle());
151 } 151 }
152 return base::string16(); 152 return base::string16();
153 } 153 }
154 154
155 bool BookmarkMenuDelegate::IsTriggerableEvent(views::MenuItemView* menu, 155 bool BookmarkMenuDelegate::IsTriggerableEvent(views::MenuItemView* menu,
156 const ui::Event& e) { 156 const ui::Event& e) {
157 return e.type() == ui::ET_GESTURE_TAP || 157 return e.type() == ui::ET_GESTURE_TAP ||
158 e.type() == ui::ET_GESTURE_TAP_DOWN || 158 e.type() == ui::ET_GESTURE_TAP_DOWN ||
159 event_utils::IsPossibleDispositionEvent(e); 159 event_utils::IsPossibleDispositionEvent(e);
160 } 160 }
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 } 544 }
545 AddMenuToMaps(child_menu_item, node); 545 AddMenuToMaps(child_menu_item, node);
546 } 546 }
547 } 547 }
548 548
549 void BookmarkMenuDelegate::AddMenuToMaps(MenuItemView* menu, 549 void BookmarkMenuDelegate::AddMenuToMaps(MenuItemView* menu,
550 const BookmarkNode* node) { 550 const BookmarkNode* node) {
551 menu_id_to_node_map_[menu->GetCommand()] = node; 551 menu_id_to_node_map_[menu->GetCommand()] = node;
552 node_to_menu_map_[node] = menu; 552 node_to_menu_map_[node] = menu;
553 } 553 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698