summaryrefslogtreecommitdiffstats
path: root/components/enhanced_bookmarks/bookmark_server_service.cc
diff options
context:
space:
mode:
authordanduong <danduong@chromium.org>2014-10-30 14:53:33 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-30 21:53:55 +0000
commitb8cf2351275e5732082956fc947d71c2b6ca8de0 (patch)
treeb6b3d2852fd23e83f5d836a1a709916a4da19aa8 /components/enhanced_bookmarks/bookmark_server_service.cc
parent1b2ec2722afacdf0bf8d917c71436780dedc849b (diff)
downloadchromium_src-b8cf2351275e5732082956fc947d71c2b6ca8de0.zip
chromium_src-b8cf2351275e5732082956fc947d71c2b6ca8de0.tar.gz
chromium_src-b8cf2351275e5732082956fc947d71c2b6ca8de0.tar.bz2
Revert "Revert of Add Search Service in Enhanced Bookmark Bridge (patchset #6 id:100001 of https://codereview.chromium.org/637323005/)"
This reverts commit 1491f336d849dcf168cc8832e91a7c8213dd2a7f. BUG=415774 TBR=yfriedman Review URL: https://codereview.chromium.org/693613003 Cr-Commit-Position: refs/heads/master@{#302165}
Diffstat (limited to 'components/enhanced_bookmarks/bookmark_server_service.cc')
-rw-r--r--components/enhanced_bookmarks/bookmark_server_service.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/components/enhanced_bookmarks/bookmark_server_service.cc b/components/enhanced_bookmarks/bookmark_server_service.cc
index 1e6f4b0..73cd8f8 100644
--- a/components/enhanced_bookmarks/bookmark_server_service.cc
+++ b/components/enhanced_bookmarks/bookmark_server_service.cc
@@ -56,6 +56,11 @@ const std::string BookmarkServerService::RemoteIDForBookmark(
return model_->GetRemoteId(bookmark);
}
+void BookmarkServerService::Cancel() {
+ url_fetcher_.reset();
+ token_request_.reset();
+}
+
void BookmarkServerService::Notify() {
FOR_EACH_OBSERVER(BookmarkServerServiceObserver, observers_, OnChange(this));
}