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

Unified Diff: chrome/renderer/searchbox/searchbox.cc

Issue 14660022: Move most visited item state info from InstantController to InstantService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + Addressed comments Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/searchbox/searchbox.cc
diff --git a/chrome/renderer/searchbox/searchbox.cc b/chrome/renderer/searchbox/searchbox.cc
index 847d4cda2c5f649d1426c9b482a278cfc5c75dc9..1856261155381652af78dd8bbd9c4f8c5576f6bc 100644
--- a/chrome/renderer/searchbox/searchbox.cc
+++ b/chrome/renderer/searchbox/searchbox.cc
@@ -97,13 +97,15 @@ void SearchBox::NavigateToURL(const GURL& url,
void SearchBox::DeleteMostVisitedItem(
InstantRestrictedID most_visited_item_id) {
render_view()->Send(new ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
- render_view()->GetRoutingID(), most_visited_item_id));
+ render_view()->GetRoutingID(),
+ GetURLForMostVisitedItem(most_visited_item_id)));
}
void SearchBox::UndoMostVisitedDeletion(
InstantRestrictedID most_visited_item_id) {
render_view()->Send(new ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
- render_view()->GetRoutingID(), most_visited_item_id));
+ render_view()->GetRoutingID(),
+ GetURLForMostVisitedItem(most_visited_item_id)));
}
void SearchBox::UndoAllMostVisitedDeletions() {
@@ -406,3 +408,8 @@ bool SearchBox::GetMostVisitedItemWithID(
return most_visited_items_cache_.GetItemWithRestrictedID(most_visited_item_id,
item);
}
+
+GURL SearchBox::GetURLForMostVisitedItem(InstantRestrictedID item_id) const {
+ InstantMostVisitedItem item;
+ return GetMostVisitedItemWithID(item_id, &item) ? item.url : GURL();
+}
« chrome/common/instant_restricted_id_cache.h ('K') | « chrome/renderer/searchbox/searchbox.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698