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

Unified Diff: chrome/browser/ui/cocoa/history_menu_bridge.mm

Issue 10825447: chrome/browser should build on the x86_64 architecture (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebased on the updated trunk. Created 8 years, 4 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/browser/ui/cocoa/history_menu_bridge.mm
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm
index 7dd8218b2ccae2ce20b9e83e0e3c6c6b4c206d81..5b2cc84034a8b09d7e1fae3add4b503588db5c0a 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm
@@ -471,7 +471,7 @@ void HistoryMenuBridge::GotFaviconData(FaviconService::Handle handle,
profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), handle);
DCHECK(item);
item->icon_requested = false;
- item->icon_handle = NULL;
+ item->icon_handle = 0;
// Convert the raw data to Skia and then to a NSImage.
// TODO(rsesek): Is there an easier way to do this?
@@ -495,6 +495,6 @@ void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) {
profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
service->CancelRequest(item->icon_handle);
item->icon_requested = false;
- item->icon_handle = NULL;
+ item->icon_handle = 0;
}
}

Powered by Google App Engine
This is Rietveld 408576698