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

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

Issue 26546004: Revert 227675 "reland "views: change WrenchMenu to use each mode..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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_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_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 16 matching lines...) Expand all
27 using content::PageNavigator; 27 using content::PageNavigator;
28 using content::UserMetricsAction; 28 using content::UserMetricsAction;
29 using views::MenuItemView; 29 using views::MenuItemView;
30 30
31 BookmarkMenuController::BookmarkMenuController(Browser* browser, 31 BookmarkMenuController::BookmarkMenuController(Browser* browser,
32 PageNavigator* page_navigator, 32 PageNavigator* page_navigator,
33 views::Widget* parent, 33 views::Widget* parent,
34 const BookmarkNode* node, 34 const BookmarkNode* node,
35 int start_child_index) 35 int start_child_index)
36 : menu_delegate_( 36 : menu_delegate_(
37 new BookmarkMenuDelegate(browser, page_navigator, parent, 1, 37 new BookmarkMenuDelegate(browser, page_navigator, parent, 1)),
38 kint32max)),
39 node_(node), 38 node_(node),
40 observer_(NULL), 39 observer_(NULL),
41 for_drop_(false), 40 for_drop_(false),
42 bookmark_bar_(NULL) { 41 bookmark_bar_(NULL) {
43 menu_delegate_->Init(this, NULL, node, start_child_index, 42 menu_delegate_->Init(this, NULL, node, start_child_index,
44 BookmarkMenuDelegate::HIDE_PERMANENT_FOLDERS, 43 BookmarkMenuDelegate::HIDE_PERMANENT_FOLDERS,
45 BOOKMARK_LAUNCH_LOCATION_BAR_SUBFOLDER); 44 BOOKMARK_LAUNCH_LOCATION_BAR_SUBFOLDER);
46 menu_runner_.reset(new views::MenuRunner(menu_delegate_->menu())); 45 menu_runner_.reset(new views::MenuRunner(menu_delegate_->menu()));
47 } 46 }
48 47
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 void BookmarkMenuController::BookmarkModelChanged() { 189 void BookmarkMenuController::BookmarkModelChanged() {
191 if (!menu_delegate_->is_mutating_model()) 190 if (!menu_delegate_->is_mutating_model())
192 menu()->Cancel(); 191 menu()->Cancel();
193 } 192 }
194 193
195 BookmarkMenuController::~BookmarkMenuController() { 194 BookmarkMenuController::~BookmarkMenuController() {
196 menu_delegate_->GetBookmarkModel()->RemoveObserver(this); 195 menu_delegate_->GetBookmarkModel()->RemoveObserver(this);
197 if (observer_) 196 if (observer_)
198 observer_->BookmarkMenuControllerDeleted(this); 197 observer_->BookmarkMenuControllerDeleted(this);
199 } 198 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698