Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Side by Side Diff: chrome/browser/bookmarks/bookmark_model.cc

Issue 230873003: Remove stale include of cancelable_request.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing #include. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/favicon/favicon_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/bookmarks/bookmark_model.h" 5 #include "chrome/browser/bookmarks/bookmark_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 1008
1009 void BookmarkModel::LoadFavicon(BookmarkNode* node) { 1009 void BookmarkModel::LoadFavicon(BookmarkNode* node) {
1010 if (node->is_folder()) 1010 if (node->is_folder())
1011 return; 1011 return;
1012 1012
1013 DCHECK(node->url().is_valid()); 1013 DCHECK(node->url().is_valid());
1014 FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( 1014 FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
1015 profile_, Profile::EXPLICIT_ACCESS); 1015 profile_, Profile::EXPLICIT_ACCESS);
1016 if (!favicon_service) 1016 if (!favicon_service)
1017 return; 1017 return;
1018 FaviconService::Handle handle = favicon_service->GetFaviconImageForURL( 1018 base::CancelableTaskTracker::TaskId taskId =
1019 FaviconService::FaviconForURLParams(node->url(), 1019 favicon_service->GetFaviconImageForURL(
1020 chrome::FAVICON, 1020 FaviconService::FaviconForURLParams(
1021 gfx::kFaviconSize), 1021 node->url(), chrome::FAVICON, gfx::kFaviconSize),
1022 base::Bind(&BookmarkModel::OnFaviconDataAvailable, 1022 base::Bind(&BookmarkModel::OnFaviconDataAvailable,
1023 base::Unretained(this), node), 1023 base::Unretained(this),
1024 &cancelable_task_tracker_); 1024 node),
1025 node->set_favicon_load_task_id(handle); 1025 &cancelable_task_tracker_);
1026 node->set_favicon_load_task_id(taskId);
1026 } 1027 }
1027 1028
1028 void BookmarkModel::FaviconLoaded(const BookmarkNode* node) { 1029 void BookmarkModel::FaviconLoaded(const BookmarkNode* node) {
1029 FOR_EACH_OBSERVER(BookmarkModelObserver, observers_, 1030 FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
1030 BookmarkNodeFaviconChanged(this, node)); 1031 BookmarkNodeFaviconChanged(this, node));
1031 } 1032 }
1032 1033
1033 void BookmarkModel::CancelPendingFaviconLoadRequests(BookmarkNode* node) { 1034 void BookmarkModel::CancelPendingFaviconLoadRequests(BookmarkNode* node) {
1034 if (node->favicon_load_task_id() != base::CancelableTaskTracker::kBadTaskId) { 1035 if (node->favicon_load_task_id() != base::CancelableTaskTracker::kBadTaskId) {
1035 cancelable_task_tracker_.TryCancel(node->favicon_load_task_id()); 1036 cancelable_task_tracker_.TryCancel(node->favicon_load_task_id());
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 BookmarkPermanentNode* bb_node = 1084 BookmarkPermanentNode* bb_node =
1084 CreatePermanentNode(BookmarkNode::BOOKMARK_BAR); 1085 CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
1085 BookmarkPermanentNode* other_node = 1086 BookmarkPermanentNode* other_node =
1086 CreatePermanentNode(BookmarkNode::OTHER_NODE); 1087 CreatePermanentNode(BookmarkNode::OTHER_NODE);
1087 BookmarkPermanentNode* mobile_node = 1088 BookmarkPermanentNode* mobile_node =
1088 CreatePermanentNode(BookmarkNode::MOBILE); 1089 CreatePermanentNode(BookmarkNode::MOBILE);
1089 return new BookmarkLoadDetails(bb_node, other_node, mobile_node, 1090 return new BookmarkLoadDetails(bb_node, other_node, mobile_node,
1090 new BookmarkIndex(profile_), 1091 new BookmarkIndex(profile_),
1091 next_node_id_); 1092 next_node_id_);
1092 } 1093 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/favicon/favicon_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698