| Index: chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
|
| diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
|
| index 7e61f857fe69df0ed8f610d52e8cf1747558d672..32cc395d55d6f6fd8b99f99227564b612b21dc3b 100644
|
| --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
|
| +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
|
| @@ -24,47 +24,44 @@ class RecentlyUsedFoldersComboModel : public ui::ComboboxModel,
|
| public BookmarkModelObserver {
|
| public:
|
| RecentlyUsedFoldersComboModel(BookmarkModel* model, const BookmarkNode* node);
|
| - virtual ~RecentlyUsedFoldersComboModel();
|
| + ~RecentlyUsedFoldersComboModel() override;
|
|
|
| // Overridden from ui::ComboboxModel:
|
| - virtual int GetItemCount() const override;
|
| - virtual base::string16 GetItemAt(int index) override;
|
| - virtual bool IsItemSeparatorAt(int index) override;
|
| - virtual int GetDefaultIndex() const override;
|
| - virtual void AddObserver(ui::ComboboxModelObserver* observer) override;
|
| - virtual void RemoveObserver(ui::ComboboxModelObserver* observer) override;
|
| + int GetItemCount() const override;
|
| + base::string16 GetItemAt(int index) override;
|
| + bool IsItemSeparatorAt(int index) override;
|
| + int GetDefaultIndex() const override;
|
| + void AddObserver(ui::ComboboxModelObserver* observer) override;
|
| + void RemoveObserver(ui::ComboboxModelObserver* observer) override;
|
|
|
| // Overriden from BookmarkModelObserver:
|
| - virtual void BookmarkModelLoaded(BookmarkModel* model,
|
| - bool ids_reassigned) override;
|
| - virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
|
| - virtual void BookmarkNodeMoved(BookmarkModel* model,
|
| - const BookmarkNode* old_parent,
|
| - int old_index,
|
| - const BookmarkNode* new_parent,
|
| - int new_index) override;
|
| - virtual void BookmarkNodeAdded(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int index) override;
|
| - virtual void OnWillRemoveBookmarks(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int old_index,
|
| + void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override;
|
| + void BookmarkModelBeingDeleted(BookmarkModel* model) override;
|
| + void BookmarkNodeMoved(BookmarkModel* model,
|
| + const BookmarkNode* old_parent,
|
| + int old_index,
|
| + const BookmarkNode* new_parent,
|
| + int new_index) override;
|
| + void BookmarkNodeAdded(BookmarkModel* model,
|
| + const BookmarkNode* parent,
|
| + int index) override;
|
| + void OnWillRemoveBookmarks(BookmarkModel* model,
|
| + const BookmarkNode* parent,
|
| + int old_index,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkNodeRemoved(BookmarkModel* model,
|
| + const BookmarkNode* parent,
|
| + int old_index,
|
| + const BookmarkNode* node,
|
| + const std::set<GURL>& removed_urls) override;
|
| + void BookmarkNodeChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkNodeFaviconChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkNodeChildrenReordered(BookmarkModel* model,
|
| const BookmarkNode* node) override;
|
| - virtual void BookmarkNodeRemoved(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int old_index,
|
| - const BookmarkNode* node,
|
| + void BookmarkAllUserNodesRemoved(BookmarkModel* model,
|
| const std::set<GURL>& removed_urls) override;
|
| - virtual void BookmarkNodeChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkNodeChildrenReordered(
|
| - BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkAllUserNodesRemoved(
|
| - BookmarkModel* model,
|
| - const std::set<GURL>& removed_urls) override;
|
|
|
| // If necessary this function moves |node| into the corresponding folder for
|
| // the given |selected_index|.
|
|
|