Index: chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc |
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc |
index 53fbab8de236cf309b73c10765c8d09dc681709f..484da8c6bae56cf661b0db5269381ca62e7b2678 100644 |
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc |
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc |
@@ -266,6 +266,52 @@ void BookmarkEditorView::ShowContextMenuForView( |
} |
} |
+const char* BookmarkEditorView::GetClassName() const { |
+ return "BookmarkEditorView"; |
+} |
+ |
+void BookmarkEditorView::BookmarkNodeMoved(BookmarkModel* model, |
+ const BookmarkNode* old_parent, |
+ int old_index, |
+ const BookmarkNode* new_parent, |
+ int new_index) { |
+ Reset(); |
+} |
+ |
+void BookmarkEditorView::BookmarkNodeAdded(BookmarkModel* model, |
+ const BookmarkNode* parent, |
+ int index) { |
+ Reset(); |
+} |
+ |
+void BookmarkEditorView::BookmarkNodeRemoved( |
+ BookmarkModel* model, |
+ const BookmarkNode* parent, |
+ int index, |
+ const BookmarkNode* node, |
+ const std::set<GURL>& removed_urls) { |
+ if ((details_.type == EditDetails::EXISTING_NODE && |
+ details_.existing_node->HasAncestor(node)) || |
+ (parent_ && parent_->HasAncestor(node))) { |
+ // The node, or its parent was removed. Close the dialog. |
+ GetWidget()->Close(); |
+ } else { |
+ Reset(); |
+ } |
+} |
+ |
+void BookmarkEditorView::BookmarkAllUserNodesRemoved( |
+ BookmarkModel* model, |
+ const std::set<GURL>& removed_urls) { |
+ Reset(); |
+} |
+ |
+void BookmarkEditorView::BookmarkNodeChildrenReordered( |
+ BookmarkModel* model, |
+ const BookmarkNode* node) { |
+ Reset(); |
+} |
+ |
void BookmarkEditorView::Init() { |
bb_model_->AddObserver(this); |
@@ -365,48 +411,6 @@ void BookmarkEditorView::Init() { |
Reset(); |
} |
-void BookmarkEditorView::BookmarkNodeMoved(BookmarkModel* model, |
- const BookmarkNode* old_parent, |
- int old_index, |
- const BookmarkNode* new_parent, |
- int new_index) { |
- Reset(); |
-} |
- |
-void BookmarkEditorView::BookmarkNodeAdded(BookmarkModel* model, |
- const BookmarkNode* parent, |
- int index) { |
- Reset(); |
-} |
- |
-void BookmarkEditorView::BookmarkNodeRemoved( |
- BookmarkModel* model, |
- const BookmarkNode* parent, |
- int index, |
- const BookmarkNode* node, |
- const std::set<GURL>& removed_urls) { |
- if ((details_.type == EditDetails::EXISTING_NODE && |
- details_.existing_node->HasAncestor(node)) || |
- (parent_ && parent_->HasAncestor(node))) { |
- // The node, or its parent was removed. Close the dialog. |
- GetWidget()->Close(); |
- } else { |
- Reset(); |
- } |
-} |
- |
-void BookmarkEditorView::BookmarkAllUserNodesRemoved( |
- BookmarkModel* model, |
- const std::set<GURL>& removed_urls) { |
- Reset(); |
-} |
- |
-void BookmarkEditorView::BookmarkNodeChildrenReordered( |
- BookmarkModel* model, |
- const BookmarkNode* node) { |
- Reset(); |
-} |
- |
void BookmarkEditorView::Reset() { |
if (!show_tree_) { |
if (parent()) |