diff options
author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 18:21:52 +0000 |
---|---|---|
committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 18:21:52 +0000 |
commit | 9b53310576cd2eae92d45ee7f03261bb723d06f8 (patch) | |
tree | 2d7339a88a7184c2cc7ecb7fa46ff215c681b681 /chrome | |
parent | a14677809404e74b53f42cd97076c9700efa7e7d (diff) | |
download | chromium_src-9b53310576cd2eae92d45ee7f03261bb723d06f8.zip chromium_src-9b53310576cd2eae92d45ee7f03261bb723d06f8.tar.gz chromium_src-9b53310576cd2eae92d45ee7f03261bb723d06f8.tar.bz2 |
Revert of Mass-rename of BookmarkModel::RemoveAll(). (https://codereview.chromium.org/323563003/)
Reason for revert:
Broke mac build.
Original issue's description:
> Mass-rename of BookmarkModel::RemoveAll().
>
> That call only removes nodes editable by the user now. Also renamed the
> corresponding BookmarkModelObserver callbacks.
>
> BUG=49598
> R=sky@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=276072
TBR=sky@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=49598
Review URL: https://codereview.chromium.org/324813008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
30 files changed, 34 insertions, 35 deletions
diff --git a/chrome/browser/android/provider/bookmark_model_observer_task.cc b/chrome/browser/android/provider/bookmark_model_observer_task.cc index b7e7aa8..6a52ff7 100644 --- a/chrome/browser/android/provider/bookmark_model_observer_task.cc +++ b/chrome/browser/android/provider/bookmark_model_observer_task.cc @@ -55,7 +55,7 @@ void BookmarkModelObserverTask::BookmarkNodeRemoved( const std::set<GURL>& removed_urls) { } -void BookmarkModelObserverTask::BookmarkAllUserNodesRemoved( +void BookmarkModelObserverTask::BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) { } diff --git a/chrome/browser/android/provider/bookmark_model_observer_task.h b/chrome/browser/android/provider/bookmark_model_observer_task.h index 63e24e1..828f44c 100644 --- a/chrome/browser/android/provider/bookmark_model_observer_task.h +++ b/chrome/browser/android/provider/bookmark_model_observer_task.h @@ -46,7 +46,7 @@ class BookmarkModelObserverTask : public BookmarkModelTask, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) OVERRIDE; - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE; virtual void BookmarkNodeChanged(BookmarkModel* model, diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc index 0213309..ce64c3b 100644 --- a/chrome/browser/android/signin/signin_manager_android.cc +++ b/chrome/browser/android/signin/signin_manager_android.cc @@ -197,7 +197,7 @@ void SigninManagerAndroid::OnPolicyFetchDone(bool success) { void SigninManagerAndroid::OnBrowsingDataRemoverDone() { BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_); - model->RemoveAllUserBookmarks(); + model->RemoveAll(); // All the Profile data has been wiped. Clear the last signed in username as // well, so that the next signin doesn't trigger the acount change dialog. diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc index a3b8db7..07b5383 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc @@ -209,7 +209,7 @@ void ChromeBookmarkClient::BookmarkNodeRemoved( NotifyHistoryOfRemovedURLs(profile_, removed_urls); } -void ChromeBookmarkClient::BookmarkAllUserNodesRemoved( +void ChromeBookmarkClient::BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) { NotifyHistoryOfRemovedURLs(profile_, removed_urls); diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.h b/chrome/browser/bookmarks/chrome_bookmark_client.h index 43fe2c9..68489c8 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client.h +++ b/chrome/browser/bookmarks/chrome_bookmark_client.h @@ -80,7 +80,7 @@ class ChromeBookmarkClient : public BookmarkClient, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) OVERRIDE; - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE; virtual void BookmarkModelLoaded(BookmarkModel* model, diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc b/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc index 31d65d4..4da9aa4 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc @@ -214,7 +214,7 @@ TEST_F(ChromeBookmarkClientTest, CreateNewNodes) { EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get())); } -TEST_F(ChromeBookmarkClientTest, RemoveAllUserBookmarks) { +TEST_F(ChromeBookmarkClientTest, RemoveAll) { // Remove the policy. const BookmarkNode* parent = client_->managed_node(); EXPECT_CALL(observer_, BookmarkNodeRemoved(model_, parent, 0, _, _)) @@ -260,8 +260,8 @@ TEST_F(ChromeBookmarkClientTest, RemoveAllDoesntRemoveManaged) { EXPECT_EQ(2, model_->bookmark_bar_node()->child_count()); Mock::VerifyAndClearExpectations(&observer_); - EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_, _)); - model_->RemoveAllUserBookmarks(); + EXPECT_CALL(observer_, BookmarkAllNodesRemoved(model_, _)); + model_->RemoveAll(); EXPECT_EQ(2, client_->managed_node()->child_count()); EXPECT_EQ(0, model_->bookmark_bar_node()->child_count()); Mock::VerifyAndClearExpectations(&observer_); diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index 2d59d62..c09877b 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -314,7 +314,7 @@ void BookmarkEventRouter::BookmarkNodeRemoved( remove_info)); } -void BookmarkEventRouter::BookmarkAllUserNodesRemoved( +void BookmarkEventRouter::BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) { NOTREACHED(); diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h index c6e9693..ef3777f 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h @@ -61,7 +61,7 @@ class BookmarkEventRouter : public BookmarkModelObserver { int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) OVERRIDE; - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE; virtual void BookmarkNodeChanged(BookmarkModel* model, diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index 6cb5160..67cce64 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc @@ -293,7 +293,7 @@ void BookmarkChangeProcessor::BookmarkNodeRemoved( RemoveSyncNodeHierarchy(node); } -void BookmarkChangeProcessor::BookmarkAllUserNodesRemoved( +void BookmarkChangeProcessor::BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) { RemoveAllSyncNodes(); diff --git a/chrome/browser/sync/glue/bookmark_change_processor.h b/chrome/browser/sync/glue/bookmark_change_processor.h index 79e8bd4..5234b8f 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.h +++ b/chrome/browser/sync/glue/bookmark_change_processor.h @@ -58,7 +58,7 @@ class BookmarkChangeProcessor : public BookmarkModelObserver, int index, const BookmarkNode* node, const std::set<GURL>& removed_urls) OVERRIDE; - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE; virtual void BookmarkNodeChanged(BookmarkModel* model, diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc index ac1e5f9..b124b52 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.cc +++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc @@ -98,7 +98,7 @@ class FaviconChangeObserver : public BookmarkModelObserver { int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) OVERRIDE {} - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE {} @@ -606,7 +606,7 @@ void RemoveAll(int profile) { } } } - GetBookmarkModel(profile)->RemoveAllUserBookmarks(); + GetBookmarkModel(profile)->RemoveAll(); } void SortChildren(int profile, const BookmarkNode* parent) { diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc index 5e33023..10e1c22 100644 --- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc +++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc @@ -121,7 +121,7 @@ void BookmarkTabHelper::BookmarkNodeRemoved( UpdateStarredStateForCurrentURL(); } -void BookmarkTabHelper::BookmarkAllUserNodesRemoved( +void BookmarkTabHelper::BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) { UpdateStarredStateForCurrentURL(); diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h index c8bef04..af6f38e 100644 --- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h +++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h @@ -74,7 +74,7 @@ class BookmarkTabHelper int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) OVERRIDE; - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE; diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc index 53c9c88..b4a581a 100644 --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.cc @@ -199,7 +199,7 @@ void RecentlyUsedFoldersComboModel::BookmarkNodeChildrenReordered( const BookmarkNode* node) { } -void RecentlyUsedFoldersComboModel::BookmarkAllUserNodesRemoved( +void RecentlyUsedFoldersComboModel::BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) { // Changing is rare enough that we don't attempt to readjust the contents. 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 5489bb7e..4e6ec9e 100644 --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h @@ -62,7 +62,7 @@ class RecentlyUsedFoldersComboModel : public ui::ComboboxModel, virtual void BookmarkNodeChildrenReordered( BookmarkModel* model, const BookmarkNode* node) OVERRIDE; - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE; diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc index 5e1cc85..8175f5e 100644 --- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc +++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc @@ -114,7 +114,7 @@ TEST_F(RecentlyUsedFoldersComboModelTest, NotifyObserver) { EXPECT_LT(updated_count, initial_count); // Remove all, which should remove a folder too. - GetModel()->RemoveAllUserBookmarks(); + GetModel()->RemoveAll(); EXPECT_TRUE(observer.GetAndClearChanged()); EXPECT_LT(model.GetItemCount(), updated_count); diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h index 2159d2e..1b2b3c6 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h @@ -43,7 +43,7 @@ class BookmarkBarBridge : public BookmarkModelObserver { int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) OVERRIDE; - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE; virtual void BookmarkNodeChanged(BookmarkModel* model, diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm index 9fc88ef..a371a62 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm @@ -76,7 +76,7 @@ void BookmarkBarBridge::BookmarkNodeRemoved( [controller_ nodeRemoved:model parent:parent index:old_index]; } -void BookmarkBarBridge::BookmarkAllUserNodesRemoved( +void BookmarkBarBridge::BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) { [controller_ loaded:model]; 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 b5a3e72..5cc1ade 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm @@ -151,7 +151,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver { [controller_ modelChangedPreserveSelection:NO]; } - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE { [controller_ modelChangedPreserveSelection:NO]; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h index 3d0c262..9a88ca2 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h @@ -56,7 +56,7 @@ class BookmarkMenuBridge : public BookmarkModelObserver, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) OVERRIDE; - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE; virtual void BookmarkNodeChanged(BookmarkModel* model, diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm index 8616ccf..7073458 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm @@ -137,7 +137,7 @@ void BookmarkMenuBridge::BookmarkNodeRemoved( InvalidateMenu(); } -void BookmarkMenuBridge::BookmarkAllUserNodesRemoved( +void BookmarkMenuBridge::BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) { InvalidateMenu(); diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h index b7bf67c..7bae3c4 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h @@ -57,7 +57,7 @@ class BookmarkModelObserverForCocoa : public BookmarkModelObserver { int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) OVERRIDE; - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE; virtual void BookmarkNodeChanged(BookmarkModel* model, diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.mm index 64ff66c..679e5c1 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.mm @@ -53,7 +53,7 @@ void BookmarkModelObserverForCocoa::BookmarkNodeRemoved( Notify(YES); } -void BookmarkModelObserverForCocoa::BookmarkAllUserNodesRemoved( +void BookmarkModelObserverForCocoa::BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) { Notify(YES); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index d6d2fc5..c73dc59 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -1066,7 +1066,7 @@ void BookmarkBarView::BookmarkNodeRemoved(BookmarkModel* model, BookmarkNodeRemovedImpl(model, parent, old_index); } -void BookmarkBarView::BookmarkAllUserNodesRemoved( +void BookmarkBarView::BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) { UpdateButtonsVisibility(); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h index f5bcffac..2c4bb48 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h @@ -220,7 +220,7 @@ class BookmarkBarView : public DetachableToolbarView, int old_index, const BookmarkNode* node, const std::set<GURL>& removed_urls) OVERRIDE; - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE; virtual void BookmarkNodeChanged(BookmarkModel* model, diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index bc3d91d..4730052 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -393,7 +393,7 @@ void BookmarkEditorView::BookmarkNodeRemoved( } } -void BookmarkEditorView::BookmarkAllUserNodesRemoved( +void BookmarkEditorView::BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) { Reset(); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h index 0082660..8130946 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h @@ -147,7 +147,7 @@ class BookmarkEditorView : public BookmarkEditor, int index, const BookmarkNode* node, const std::set<GURL>& removed_urls) OVERRIDE; - virtual void BookmarkAllUserNodesRemoved( + virtual void BookmarkAllNodesRemoved( BookmarkModel* model, const std::set<GURL>& removed_urls) OVERRIDE; virtual void BookmarkNodeChanged(BookmarkModel* model, diff --git a/chrome/browser/undo/bookmark_undo_service.cc b/chrome/browser/undo/bookmark_undo_service.cc index e47158d..7bd1f28 100644 --- a/chrome/browser/undo/bookmark_undo_service.cc +++ b/chrome/browser/undo/bookmark_undo_service.cc @@ -433,7 +433,7 @@ void BookmarkUndoService::OnWillRemoveBookmarks(BookmarkModel* model, undo_manager()->AddUndoOperation(op.Pass()); } -void BookmarkUndoService::OnWillRemoveAllUserBookmarks(BookmarkModel* model) { +void BookmarkUndoService::OnWillRemoveAllBookmarks(BookmarkModel* model) { bookmarks::ScopedGroupBookmarkActions merge_removes(model); for (int i = 0; i < model->root_node()->child_count(); ++i) { const BookmarkNode* permanent_node = model->root_node()->GetChild(i); diff --git a/chrome/browser/undo/bookmark_undo_service.h b/chrome/browser/undo/bookmark_undo_service.h index cd024bf..ef5686f 100644 --- a/chrome/browser/undo/bookmark_undo_service.h +++ b/chrome/browser/undo/bookmark_undo_service.h @@ -49,7 +49,7 @@ class BookmarkUndoService : public BaseBookmarkModelObserver, const BookmarkNode* parent, int old_index, const BookmarkNode* node) OVERRIDE; - virtual void OnWillRemoveAllUserBookmarks(BookmarkModel* model) OVERRIDE; + virtual void OnWillRemoveAllBookmarks(BookmarkModel* model) OVERRIDE; virtual void OnWillChangeBookmarkNode(BookmarkModel* model, const BookmarkNode* node) OVERRIDE; virtual void OnWillReorderBookmarkNode(BookmarkModel* model, diff --git a/chrome/browser/undo/bookmark_undo_service_test.cc b/chrome/browser/undo/bookmark_undo_service_test.cc index e8008f9..4478264 100644 --- a/chrome/browser/undo/bookmark_undo_service_test.cc +++ b/chrome/browser/undo/bookmark_undo_service_test.cc @@ -329,10 +329,9 @@ TEST_F(BookmarkUndoServiceTest, UndoBookmarkRemoveAll) { new_folder = model->AddFolder(parent, 1, ASCIIToUTF16("folder")); model->AddURL(new_folder, 0, ASCIIToUTF16("b"), GURL("http://www.b.com")); - model->RemoveAllUserBookmarks(); + model->RemoveAll(); - // Test that the undo of RemoveAllUserBookmarks restores all folders and - // bookmarks. + // Test that the undo of RemoveAll restores all folders and bookmarks. undo_service->undo_manager()->Undo(); ASSERT_EQ(2, model->other_node()->child_count()); |