diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 20:59:17 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 20:59:17 +0000 |
| commit | f4399ae2b9dfec9bd99d8ad90be4936a79cf8ab7 (patch) | |
| tree | 1c1de2c818a0d80c0f9f3238014d9b76ad836171 /chrome/browser | |
| parent | a205d7373cb75c3581c430aa448bf938b69f0c18 (diff) | |
| download | chromium_src-f4399ae2b9dfec9bd99d8ad90be4936a79cf8ab7.zip chromium_src-f4399ae2b9dfec9bd99d8ad90be4936a79cf8ab7.tar.gz chromium_src-f4399ae2b9dfec9bd99d8ad90be4936a79cf8ab7.tar.bz2 | |
GTK: Compile fix for Natty in history menu code
(Got lost in the merging)
BUG=30213
TEST=compiles on natty
Review URL: http://codereview.chromium.org/6904031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83069 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ui/gtk/global_history_menu.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/global_history_menu.cc b/chrome/browser/ui/gtk/global_history_menu.cc index 83c861c..3df4b58 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); } } |