summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 23:15:21 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 23:15:21 +0000
commite32d94ef042eac126d15823cc2e9258b0332c6d1 (patch)
tree9a01b830208a4a59084658d14d0dc635390b4ce0 /chrome/browser/bookmarks
parent7516da7ed78fab9987d9c782c0beb6d36a9565ff (diff)
downloadchromium_src-e32d94ef042eac126d15823cc2e9258b0332c6d1.zip
chromium_src-e32d94ef042eac126d15823cc2e9258b0332c6d1.tar.gz
chromium_src-e32d94ef042eac126d15823cc2e9258b0332c6d1.tar.bz2
Lands http://codereview.chromium.org/1649009/show from Thiago:
Use BaseBookmarkModelObserver when all events funel into a single method. Using it, instead of BookmarkModelObserver, we can simplify the BookmarkContextMenuController. BUG=None TEST=everything should works as before. Review URL: http://codereview.chromium.org/1692001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r--chrome/browser/bookmarks/bookmark_context_menu_controller.cc43
-rw-r--r--chrome/browser/bookmarks/bookmark_context_menu_controller.h32
2 files changed, 6 insertions, 69 deletions
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
index 61e14d1..d6c01cf 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
@@ -376,48 +376,7 @@ bool BookmarkContextMenuController::IsCommandIdEnabled(int command_id) const {
return true;
}
-void BookmarkContextMenuController::BookmarkModelBeingDeleted(
- BookmarkModel* model) {
- ModelChanged();
-}
-
-void BookmarkContextMenuController::BookmarkNodeMoved(
- BookmarkModel* model,
- const BookmarkNode* old_parent,
- int old_index,
- const BookmarkNode* new_parent,
- int new_index) {
- ModelChanged();
-}
-
-void BookmarkContextMenuController::BookmarkNodeAdded(
- BookmarkModel* model,
- const BookmarkNode* parent,
- int index) {
- ModelChanged();
-}
-
-void BookmarkContextMenuController::BookmarkNodeRemoved(
- BookmarkModel* model,
- const BookmarkNode* parent,
- int index,
- const BookmarkNode* node) {
- ModelChanged();
-}
-
-void BookmarkContextMenuController::BookmarkNodeChanged(
- BookmarkModel* model,
- const BookmarkNode* node) {
- ModelChanged();
-}
-
-void BookmarkContextMenuController::BookmarkNodeChildrenReordered(
- BookmarkModel* model,
- const BookmarkNode* node) {
- ModelChanged();
-}
-
-void BookmarkContextMenuController::ModelChanged() {
+void BookmarkContextMenuController::BookmarkModelChanged() {
if (delegate_)
delegate_->CloseMenu();
}
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/bookmarks/bookmark_context_menu_controller.h
index ab3f936..3d3bebd 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller.h
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.h
@@ -9,7 +9,7 @@
#include "app/menus/simple_menu_model.h"
#include "base/basictypes.h"
-#include "chrome/browser/bookmarks/bookmark_model_observer.h"
+#include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
#include "gfx/native_widget_types.h"
class Browser;
@@ -34,7 +34,7 @@ class BookmarkContextMenuControllerDelegate {
// BookmarkContextMenuController creates and manages state for the context menu
// shown for any bookmark item.
-class BookmarkContextMenuController : public BookmarkModelObserver,
+class BookmarkContextMenuController : public BaseBookmarkModelObserver,
public menus::SimpleMenuModel::Delegate {
public:
// Used to configure what the context menu shows.
@@ -99,31 +99,9 @@ class BookmarkContextMenuController : public BookmarkModelObserver,
// Adds a checkable item to the menu.
void AddCheckboxItem(int id);
- // BookmarkModelObserver methods. Any change to the model results in closing
- // the menu.
- virtual void Loaded(BookmarkModel* model) {}
- virtual void BookmarkModelBeingDeleted(BookmarkModel* model);
- virtual void BookmarkNodeMoved(BookmarkModel* model,
- const BookmarkNode* old_parent,
- int old_index,
- const BookmarkNode* new_parent,
- int new_index);
- virtual void BookmarkNodeAdded(BookmarkModel* model,
- const BookmarkNode* parent,
- int index);
- virtual void BookmarkNodeRemoved(BookmarkModel* model,
- const BookmarkNode* parent,
- int index,
- const BookmarkNode* node);
- virtual void BookmarkNodeChanged(BookmarkModel* model,
- const BookmarkNode* node);
- virtual void BookmarkNodeFavIconLoaded(BookmarkModel* model,
- const BookmarkNode* node) {}
- virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
- const BookmarkNode* node);
-
- // Invoked from the various bookmark model observer methods. Closes the menu.
- void ModelChanged();
+ // Overridden from BaseBookmarkModelObserver:
+ // Any change to the model results in closing the menu.
+ virtual void BookmarkModelChanged();
// Returns true if selection_ has at least one bookmark of type url.
bool HasURLs() const;