Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5650)

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm

Issue 7055021: Renames BookmarkModelObserver::BookmarkNodeFaviconLoaded to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 7b10686425ba37fd5a84fb466180c5f10836365a..ee1ff234c0fde41699380df714a72ebee8e7e42e 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
@@ -85,7 +85,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
importing_(false)
{ }
- virtual void Loaded(BookmarkModel* model) {
+ virtual void Loaded(BookmarkModel* model) OVERRIDE{
[controller_ modelChangedPreserveSelection:YES];
}
@@ -93,14 +93,14 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
const BookmarkNode* old_parent,
int old_index,
const BookmarkNode* new_parent,
- int new_index) {
+ 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) {
+ int index) OVERRIDE {
if (!importing_ && parent->GetChild(index)->is_folder())
[controller_ modelChangedPreserveSelection:YES];
}
@@ -108,36 +108,37 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
virtual void BookmarkNodeRemoved(BookmarkModel* model,
const BookmarkNode* parent,
int old_index,
- const BookmarkNode* node) {
+ const BookmarkNode* node) OVERRIDE {
[controller_ nodeRemoved:node fromParent:parent];
if (node->is_folder())
[controller_ modelChangedPreserveSelection:NO];
}
virtual void BookmarkNodeChanged(BookmarkModel* model,
- const BookmarkNode* node) {
+ const BookmarkNode* node) OVERRIDE {
if (!importing_ && node->is_folder())
[controller_ modelChangedPreserveSelection:YES];
}
- virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
- const BookmarkNode* node) {
+ virtual void BookmarkNodeChildrenReordered(
+ BookmarkModel* model,
+ const BookmarkNode* node) OVERRIDE {
if (!importing_)
[controller_ modelChangedPreserveSelection:YES];
}
- virtual void BookmarkNodeFaviconLoaded(BookmarkModel* model,
- const BookmarkNode* node) {
+ virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
+ const BookmarkNode* node) OVERRIDE {
// I care nothing for these 'favicons': I only show folders.
}
- virtual void BookmarkImportBeginning(BookmarkModel* model) {
+ virtual void BookmarkImportBeginning(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 BookmarkImportEnding(BookmarkModel* model) {
+ virtual void BookmarkImportEnding(BookmarkModel* model) OVERRIDE {
importing_ = false;
[controller_ modelChangedPreserveSelection:YES];
}

Powered by Google App Engine
This is Rietveld 408576698