summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc')
-rw-r--r--chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
index 92c40ee..726b4ca 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h"
#include "ui/base/theme_provider.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image.h"
#include "ui/gfx/path.h"
#include "ui/views/widget/widget.h"
@@ -275,10 +276,10 @@ bool OmniboxPopupContentsView::IsHoveredIndex(size_t index) const {
return index == model_->hovered_line();
}
-const SkBitmap* OmniboxPopupContentsView::GetIconIfExtensionMatch(
+gfx::Image OmniboxPopupContentsView::GetIconIfExtensionMatch(
size_t index) const {
if (!HasMatchAt(index))
- return NULL;
+ return gfx::Image();
return model_->GetIconIfExtensionMatch(GetMatchAtIndex(index));
}