diff options
4 files changed, 12 insertions, 138 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; diff --git a/chrome/browser/views/bookmark_context_menu_controller_views.cc b/chrome/browser/views/bookmark_context_menu_controller_views.cc index 5cf1bc0..a6ceedc 100644 --- a/chrome/browser/views/bookmark_context_menu_controller_views.cc +++ b/chrome/browser/views/bookmark_context_menu_controller_views.cc @@ -355,48 +355,7 @@ bool BookmarkContextMenuControllerViews::IsCommandEnabled(int id) const { return true; } -void BookmarkContextMenuControllerViews::BookmarkModelBeingDeleted( - BookmarkModel* model) { - ModelChanged(); -} - -void BookmarkContextMenuControllerViews::BookmarkNodeMoved( - BookmarkModel* model, - const BookmarkNode* old_parent, - int old_index, - const BookmarkNode* new_parent, - int new_index) { - ModelChanged(); -} - -void BookmarkContextMenuControllerViews::BookmarkNodeAdded( - BookmarkModel* model, - const BookmarkNode* parent, - int index) { - ModelChanged(); -} - -void BookmarkContextMenuControllerViews::BookmarkNodeRemoved( - BookmarkModel* model, - const BookmarkNode* parent, - int index, - const BookmarkNode* node) { - ModelChanged(); -} - -void BookmarkContextMenuControllerViews::BookmarkNodeChanged( - BookmarkModel* model, - const BookmarkNode* node) { - ModelChanged(); -} - -void BookmarkContextMenuControllerViews::BookmarkNodeChildrenReordered( - BookmarkModel* model, - const BookmarkNode* node) { - ModelChanged(); -} - -void BookmarkContextMenuControllerViews::ModelChanged() { +void BookmarkContextMenuControllerViews::BookmarkModelChanged() { delegate_->CloseMenu(); } diff --git a/chrome/browser/views/bookmark_context_menu_controller_views.h b/chrome/browser/views/bookmark_context_menu_controller_views.h index 20453b8..ec84294 100644 --- a/chrome/browser/views/bookmark_context_menu_controller_views.h +++ b/chrome/browser/views/bookmark_context_menu_controller_views.h @@ -8,7 +8,7 @@ #include <vector> #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; @@ -40,7 +40,7 @@ class BookmarkContextMenuControllerViewsDelegate { // BookmarkContextMenuControllerViews creates and manages state for the context // menu shown for any bookmark item. -class BookmarkContextMenuControllerViews : public BookmarkModelObserver { +class BookmarkContextMenuControllerViews : public BaseBookmarkModelObserver { public: // Used to configure what the context menu shows. enum ConfigurationType { @@ -84,31 +84,9 @@ class BookmarkContextMenuControllerViews : public BookmarkModelObserver { PageNavigator* navigator() const { return navigator_; } private: - // 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(); // Removes the observer from the model and NULLs out model_. BookmarkModel* RemoveModelObserver(); |