summaryrefslogtreecommitdiffstats
path: root/components/enhanced_bookmarks/bookmark_server_service.cc
diff options
context:
space:
mode:
authornoyau <noyau@chromium.org>2014-10-07 15:00:43 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-07 22:01:00 +0000
commit6bb374fc58bfeeb7966b6a548b1c7b41af9c8e47 (patch)
tree7b9d87b6c35ea4350be96c62016e5c2a77fd5d0b /components/enhanced_bookmarks/bookmark_server_service.cc
parentda97e832e41826d3ce0e6bd5c495feb636345ece (diff)
downloadchromium_src-6bb374fc58bfeeb7966b6a548b1c7b41af9c8e47.zip
chromium_src-6bb374fc58bfeeb7966b6a548b1c7b41af9c8e47.tar.gz
chromium_src-6bb374fc58bfeeb7966b6a548b1c7b41af9c8e47.tar.bz2
Bring up of the enhanced bookmarks cluster service.
This service retrieves the cluster of bookmarks from the bookmark server. BUG=None Review URL: https://codereview.chromium.org/539173004 Cr-Commit-Position: refs/heads/master@{#298582}
Diffstat (limited to 'components/enhanced_bookmarks/bookmark_server_service.cc')
-rw-r--r--components/enhanced_bookmarks/bookmark_server_service.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/components/enhanced_bookmarks/bookmark_server_service.cc b/components/enhanced_bookmarks/bookmark_server_service.cc
index b6bd583..08217a2 100644
--- a/components/enhanced_bookmarks/bookmark_server_service.cc
+++ b/components/enhanced_bookmarks/bookmark_server_service.cc
@@ -48,11 +48,7 @@ void BookmarkServerService::RemoveObserver(
const BookmarkNode* BookmarkServerService::BookmarkForRemoteId(
const std::string& remote_id) const {
- std::map<std::string, const BookmarkNode*>::const_iterator it =
- starsid_to_bookmark_.find(remote_id);
- if (it == starsid_to_bookmark_.end())
- return NULL;
- return it->second;
+ return model_->BookmarkForRemoteId(remote_id);
}
const std::string BookmarkServerService::RemoteIDForBookmark(
@@ -91,7 +87,8 @@ void BookmarkServerService::OnGetTokenSuccess(
const OAuth2TokenService::Request* request,
const std::string& access_token,
const base::Time& expiration_time) {
- url_fetcher_.reset(CreateFetcher());
+ url_fetcher_ = CreateFetcher();
+
// Free the token request.
token_request_.reset();