| Index: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
|
| index b2a25e087b18ff026c7f75524a2f222dca8df585..3285fc95a2e5b0b3842a237b6d926b5612bdfbda 100644
|
| --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
|
| @@ -123,70 +123,66 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
|
| importing_(false)
|
| { }
|
|
|
| - virtual void BookmarkModelLoaded(BookmarkModel* model,
|
| - bool ids_reassigned) override {
|
| + void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override {
|
| [controller_ modelChangedPreserveSelection:YES];
|
| }
|
|
|
| - virtual void BookmarkNodeMoved(BookmarkModel* model,
|
| - const BookmarkNode* old_parent,
|
| - int old_index,
|
| - const BookmarkNode* new_parent,
|
| - int new_index) override {
|
| + void BookmarkNodeMoved(BookmarkModel* model,
|
| + const BookmarkNode* old_parent,
|
| + int old_index,
|
| + const BookmarkNode* new_parent,
|
| + int new_index) override {
|
| if (!importing_ && new_parent->GetChild(new_index)->is_folder())
|
| [controller_ modelChangedPreserveSelection:YES];
|
| }
|
|
|
| - virtual void BookmarkNodeAdded(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int index) override {
|
| + void BookmarkNodeAdded(BookmarkModel* model,
|
| + const BookmarkNode* parent,
|
| + int index) override {
|
| if (!importing_ && parent->GetChild(index)->is_folder())
|
| [controller_ modelChangedPreserveSelection:YES];
|
| }
|
|
|
| - virtual void BookmarkNodeRemoved(
|
| - BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int old_index,
|
| - const BookmarkNode* node,
|
| - const std::set<GURL>& removed_urls) override {
|
| + void BookmarkNodeRemoved(BookmarkModel* model,
|
| + const BookmarkNode* parent,
|
| + int old_index,
|
| + const BookmarkNode* node,
|
| + const std::set<GURL>& removed_urls) override {
|
| [controller_ nodeRemoved:node fromParent:parent];
|
| if (node->is_folder())
|
| [controller_ modelChangedPreserveSelection:NO];
|
| }
|
|
|
| - virtual void BookmarkAllUserNodesRemoved(
|
| + void BookmarkAllUserNodesRemoved(
|
| BookmarkModel* model,
|
| const std::set<GURL>& removed_urls) override {
|
| [controller_ modelChangedPreserveSelection:NO];
|
| }
|
|
|
| - virtual void BookmarkNodeChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override {
|
| + void BookmarkNodeChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override {
|
| if (!importing_ && node->is_folder())
|
| [controller_ modelChangedPreserveSelection:YES];
|
| }
|
|
|
| - virtual void BookmarkNodeChildrenReordered(
|
| - BookmarkModel* model,
|
| - const BookmarkNode* node) override {
|
| + void BookmarkNodeChildrenReordered(BookmarkModel* model,
|
| + const BookmarkNode* node) override {
|
| if (!importing_)
|
| [controller_ modelChangedPreserveSelection:YES];
|
| }
|
|
|
| - virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override {
|
| + void BookmarkNodeFaviconChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override {
|
| // I care nothing for these 'favicons': I only show folders.
|
| }
|
|
|
| - virtual void ExtensiveBookmarkChangesBeginning(
|
| - BookmarkModel* model) override {
|
| + void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override {
|
| importing_ = true;
|
| }
|
|
|
| // Invoked after a batch import finishes. This tells observers to update
|
| // themselves if they were waiting for the update to finish.
|
| - virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override {
|
| + void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override {
|
| importing_ = false;
|
| [controller_ modelChangedPreserveSelection:YES];
|
| }
|
|
|