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

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

Issue 2524773002: Update the bookmark tooltip text only when necessary (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 10 matching lines...) Expand all
21 #include "components/prefs/pref_service.h" 21 #include "components/prefs/pref_service.h"
22 #include "content/public/browser/page_navigator.h" 22 #include "content/public/browser/page_navigator.h"
23 #include "content/public/browser/user_metrics.h" 23 #include "content/public/browser/user_metrics.h"
24 #include "ui/base/dragdrop/os_exchange_data.h" 24 #include "ui/base/dragdrop/os_exchange_data.h"
25 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/base/window_open_disposition.h" 26 #include "ui/base/window_open_disposition.h"
27 #include "ui/resources/grit/ui_resources.h" 27 #include "ui/resources/grit/ui_resources.h"
28 #include "ui/views/controls/button/menu_button.h" 28 #include "ui/views/controls/button/menu_button.h"
29 #include "ui/views/controls/menu/menu_item_view.h" 29 #include "ui/views/controls/menu/menu_item_view.h"
30 #include "ui/views/controls/menu/submenu_view.h" 30 #include "ui/views/controls/menu/submenu_view.h"
31 #include "ui/views/widget/tooltip_manager.h"
31 #include "ui/views/widget/widget.h" 32 #include "ui/views/widget/widget.h"
32 33
33 using base::UserMetricsAction; 34 using base::UserMetricsAction;
34 using bookmarks::BookmarkModel; 35 using bookmarks::BookmarkModel;
35 using bookmarks::BookmarkNode; 36 using bookmarks::BookmarkNode;
36 using bookmarks::BookmarkNodeData; 37 using bookmarks::BookmarkNodeData;
37 using content::PageNavigator; 38 using content::PageNavigator;
38 using views::MenuItemView; 39 using views::MenuItemView;
39 40
40 namespace { 41 namespace {
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 const gfx::Point& screen_loc) const { 139 const gfx::Point& screen_loc) const {
139 MenuIDToNodeMap::const_iterator i = menu_id_to_node_map_.find(id); 140 MenuIDToNodeMap::const_iterator i = menu_id_to_node_map_.find(id);
140 // 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.
141 if (i == menu_id_to_node_map_.end()) { 142 if (i == menu_id_to_node_map_.end()) {
142 DCHECK(is_mutating_model_); 143 DCHECK(is_mutating_model_);
143 return base::string16(); 144 return base::string16();
144 } 145 }
145 146
146 const BookmarkNode* node = i->second; 147 const BookmarkNode* node = i->second;
147 if (node->is_url()) { 148 if (node->is_url()) {
149 const views::TooltipManager* tooltip_manager = parent_->GetTooltipManager();
148 return BookmarkBarView::CreateToolTipForURLAndTitle( 150 return BookmarkBarView::CreateToolTipForURLAndTitle(
149 parent_, screen_loc, node->url(), node->GetTitle()); 151 tooltip_manager->GetMaxWidth(screen_loc),
152 tooltip_manager->GetFontList(), node->url(), node->GetTitle());
150 } 153 }
151 return base::string16(); 154 return base::string16();
152 } 155 }
153 156
154 bool BookmarkMenuDelegate::IsTriggerableEvent(views::MenuItemView* menu, 157 bool BookmarkMenuDelegate::IsTriggerableEvent(views::MenuItemView* menu,
155 const ui::Event& e) { 158 const ui::Event& e) {
156 return e.type() == ui::ET_GESTURE_TAP || 159 return e.type() == ui::ET_GESTURE_TAP ||
157 e.type() == ui::ET_GESTURE_TAP_DOWN || 160 e.type() == ui::ET_GESTURE_TAP_DOWN ||
158 event_utils::IsPossibleDispositionEvent(e); 161 event_utils::IsPossibleDispositionEvent(e);
159 } 162 }
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 } 547 }
545 AddMenuToMaps(child_menu_item, node); 548 AddMenuToMaps(child_menu_item, node);
546 } 549 }
547 } 550 }
548 551
549 void BookmarkMenuDelegate::AddMenuToMaps(MenuItemView* menu, 552 void BookmarkMenuDelegate::AddMenuToMaps(MenuItemView* menu,
550 const BookmarkNode* node) { 553 const BookmarkNode* node) {
551 menu_id_to_node_map_[menu->GetCommand()] = node; 554 menu_id_to_node_map_[menu->GetCommand()] = node;
552 node_to_menu_map_[node] = menu; 555 node_to_menu_map_[node] = menu;
553 } 556 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698