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

Unified Diff: chrome/browser/ui/gtk/global_history_menu.cc

Issue 6904031: GTK: Compile fix for Natty in history menu code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/global_history_menu.cc
diff --git a/chrome/browser/ui/gtk/global_history_menu.cc b/chrome/browser/ui/gtk/global_history_menu.cc
index 83c861c3d3cffaa69083d6032abd10e23b405def..3df4b58523376c1b7952a524b251a7f3f7b2b299 100644
--- a/chrome/browser/ui/gtk/global_history_menu.cc
+++ b/chrome/browser/ui/gtk/global_history_menu.cc
@@ -222,7 +222,7 @@ void GlobalHistoryMenu::GotFaviconData(FaviconService::Handle handle,
profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), handle);
DCHECK(item);
item->icon_requested = false;
- item->icon_handle = NULL;
+ item->icon_handle = static_cast<CancelableRequestProvider::Handle>(NULL);
SkBitmap icon;
if (favicon.is_valid() &&
@@ -249,7 +249,7 @@ void GlobalHistoryMenu::CancelFaviconRequest(HistoryItem* item) {
profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
service->CancelRequest(item->icon_handle);
item->icon_requested = false;
- item->icon_handle = NULL;
+ item->icon_handle = static_cast<CancelableRequestProvider::Handle>(NULL);
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698