| 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 910709f49fe3bbe6cc124a095054af62c4be3d0c..b2a25e087b18ff026c7f75524a2f222dca8df585 100644
|
| --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
|
| @@ -124,7 +124,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
|
| { }
|
|
|
| virtual void BookmarkModelLoaded(BookmarkModel* model,
|
| - bool ids_reassigned) OVERRIDE {
|
| + bool ids_reassigned) override {
|
| [controller_ modelChangedPreserveSelection:YES];
|
| }
|
|
|
| @@ -132,14 +132,14 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
|
| const BookmarkNode* old_parent,
|
| int old_index,
|
| const BookmarkNode* new_parent,
|
| - int new_index) OVERRIDE {
|
| + 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 {
|
| + int index) override {
|
| if (!importing_ && parent->GetChild(index)->is_folder())
|
| [controller_ modelChangedPreserveSelection:YES];
|
| }
|
| @@ -149,7 +149,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
|
| const BookmarkNode* parent,
|
| int old_index,
|
| const BookmarkNode* node,
|
| - const std::set<GURL>& removed_urls) OVERRIDE {
|
| + const std::set<GURL>& removed_urls) override {
|
| [controller_ nodeRemoved:node fromParent:parent];
|
| if (node->is_folder())
|
| [controller_ modelChangedPreserveSelection:NO];
|
| @@ -157,36 +157,36 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
|
|
|
| virtual void BookmarkAllUserNodesRemoved(
|
| BookmarkModel* model,
|
| - const std::set<GURL>& removed_urls) OVERRIDE {
|
| + const std::set<GURL>& removed_urls) override {
|
| [controller_ modelChangedPreserveSelection:NO];
|
| }
|
|
|
| virtual void BookmarkNodeChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) OVERRIDE {
|
| + const BookmarkNode* node) override {
|
| if (!importing_ && node->is_folder())
|
| [controller_ modelChangedPreserveSelection:YES];
|
| }
|
|
|
| virtual void BookmarkNodeChildrenReordered(
|
| BookmarkModel* model,
|
| - const BookmarkNode* node) OVERRIDE {
|
| + const BookmarkNode* node) override {
|
| if (!importing_)
|
| [controller_ modelChangedPreserveSelection:YES];
|
| }
|
|
|
| virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) OVERRIDE {
|
| + const BookmarkNode* node) override {
|
| // I care nothing for these 'favicons': I only show folders.
|
| }
|
|
|
| virtual void ExtensiveBookmarkChangesBeginning(
|
| - BookmarkModel* model) OVERRIDE {
|
| + 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 {
|
| + virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override {
|
| importing_ = false;
|
| [controller_ modelChangedPreserveSelection:YES];
|
| }
|
|
|