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

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

Issue 1005873012: Makes bookmark menu lazily create menus and removes limits (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review feedback Created 5 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_controller_views.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/bookmarks/bookmark_stats.h" 10 #include "chrome/browser/bookmarks/bookmark_stats.h"
(...skipping 13 matching lines...) Expand all
24 using bookmarks::BookmarkNode; 24 using bookmarks::BookmarkNode;
25 using content::PageNavigator; 25 using content::PageNavigator;
26 using views::MenuItemView; 26 using views::MenuItemView;
27 27
28 BookmarkMenuController::BookmarkMenuController(Browser* browser, 28 BookmarkMenuController::BookmarkMenuController(Browser* browser,
29 PageNavigator* page_navigator, 29 PageNavigator* page_navigator,
30 views::Widget* parent, 30 views::Widget* parent,
31 const BookmarkNode* node, 31 const BookmarkNode* node,
32 int start_child_index, 32 int start_child_index,
33 bool for_drop) 33 bool for_drop)
34 : menu_delegate_( 34 : menu_delegate_(new BookmarkMenuDelegate(browser, page_navigator, parent)),
35 new BookmarkMenuDelegate(browser, page_navigator, parent, 1,
36 kint32max)),
37 node_(node), 35 node_(node),
38 observer_(NULL), 36 observer_(NULL),
39 for_drop_(for_drop), 37 for_drop_(for_drop),
40 bookmark_bar_(NULL) { 38 bookmark_bar_(NULL) {
41 menu_delegate_->Init(this, NULL, node, start_child_index, 39 menu_delegate_->Init(this, NULL, node, start_child_index,
42 BookmarkMenuDelegate::HIDE_PERMANENT_FOLDERS, 40 BookmarkMenuDelegate::HIDE_PERMANENT_FOLDERS,
43 BOOKMARK_LAUNCH_LOCATION_BAR_SUBFOLDER); 41 BOOKMARK_LAUNCH_LOCATION_BAR_SUBFOLDER);
44 menu_runner_.reset(new views::MenuRunner( 42 menu_runner_.reset(new views::MenuRunner(
45 menu_delegate_->menu(), for_drop ? views::MenuRunner::FOR_DROP : 0)); 43 menu_delegate_->menu(), for_drop ? views::MenuRunner::FOR_DROP : 0));
46 } 44 }
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 *button = bookmark_bar_->GetMenuButtonForNode(node); 177 *button = bookmark_bar_->GetMenuButtonForNode(node);
180 bookmark_bar_->GetAnchorPositionForButton(*button, anchor); 178 bookmark_bar_->GetAnchorPositionForButton(*button, anchor);
181 *has_mnemonics = false; 179 *has_mnemonics = false;
182 return this->menu(); 180 return this->menu();
183 } 181 }
184 182
185 int BookmarkMenuController::GetMaxWidthForMenu(MenuItemView* view) { 183 int BookmarkMenuController::GetMaxWidthForMenu(MenuItemView* view) {
186 return menu_delegate_->GetMaxWidthForMenu(view); 184 return menu_delegate_->GetMaxWidthForMenu(view);
187 } 185 }
188 186
187 void BookmarkMenuController::WillShowMenu(MenuItemView* menu) {
188 menu_delegate_->WillShowMenu(menu);
189 }
190
189 void BookmarkMenuController::BookmarkModelChanged() { 191 void BookmarkMenuController::BookmarkModelChanged() {
190 if (!menu_delegate_->is_mutating_model()) 192 if (!menu_delegate_->is_mutating_model())
191 menu()->Cancel(); 193 menu()->Cancel();
192 } 194 }
193 195
194 BookmarkMenuController::~BookmarkMenuController() { 196 BookmarkMenuController::~BookmarkMenuController() {
195 menu_delegate_->GetBookmarkModel()->RemoveObserver(this); 197 menu_delegate_->GetBookmarkModel()->RemoveObserver(this);
196 if (observer_) 198 if (observer_)
197 observer_->BookmarkMenuControllerDeleted(this); 199 observer_->BookmarkMenuControllerDeleted(this);
198 } 200 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698