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

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

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enhanced_bookmarks fix Created 5 years, 10 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"
11 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" 11 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
12 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_observer.h" 12 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_observer.h"
13 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" 13 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
14 #include "components/bookmarks/browser/bookmark_model.h" 14 #include "components/bookmarks/browser/bookmark_model.h"
15 #include "content/public/browser/page_navigator.h" 15 #include "content/public/browser/page_navigator.h"
16 #include "content/public/browser/user_metrics.h" 16 #include "content/public/browser/user_metrics.h"
17 #include "ui/base/dragdrop/os_exchange_data.h" 17 #include "ui/base/dragdrop/os_exchange_data.h"
18 #include "ui/views/controls/button/menu_button.h" 18 #include "ui/views/controls/button/menu_button.h"
19 #include "ui/views/controls/menu/menu_item_view.h" 19 #include "ui/views/controls/menu/menu_item_view.h"
20 #include "ui/views/controls/menu/menu_runner.h" 20 #include "ui/views/controls/menu/menu_runner.h"
21 #include "ui/views/widget/widget.h" 21 #include "ui/views/widget/widget.h"
22 22
23 using base::UserMetricsAction; 23 using base::UserMetricsAction;
24 using bookmarks::BookmarkNode;
24 using content::PageNavigator; 25 using content::PageNavigator;
25 using views::MenuItemView; 26 using views::MenuItemView;
26 27
27 BookmarkMenuController::BookmarkMenuController(Browser* browser, 28 BookmarkMenuController::BookmarkMenuController(Browser* browser,
28 PageNavigator* page_navigator, 29 PageNavigator* page_navigator,
29 views::Widget* parent, 30 views::Widget* parent,
30 const BookmarkNode* node, 31 const BookmarkNode* node,
31 int start_child_index, 32 int start_child_index,
32 bool for_drop) 33 bool for_drop)
33 : menu_delegate_( 34 : menu_delegate_(
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 void BookmarkMenuController::BookmarkModelChanged() { 189 void BookmarkMenuController::BookmarkModelChanged() {
189 if (!menu_delegate_->is_mutating_model()) 190 if (!menu_delegate_->is_mutating_model())
190 menu()->Cancel(); 191 menu()->Cancel();
191 } 192 }
192 193
193 BookmarkMenuController::~BookmarkMenuController() { 194 BookmarkMenuController::~BookmarkMenuController() {
194 menu_delegate_->GetBookmarkModel()->RemoveObserver(this); 195 menu_delegate_->GetBookmarkModel()->RemoveObserver(this);
195 if (observer_) 196 if (observer_)
196 observer_->BookmarkMenuControllerDeleted(this); 197 observer_->BookmarkMenuControllerDeleted(this);
197 } 198 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698