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/browser/android | |
| 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/browser/android')
3 files changed, 3 insertions, 3 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. |