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

Unified Diff: chrome/browser/ui/omnibox/omnibox_popup_model.cc

Issue 10829370: Make search icon in omnibox results hidpi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/omnibox/omnibox_popup_model.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.cc b/chrome/browser/ui/omnibox/omnibox_popup_model.cc
index 6492eb9a4ba0a905078da55f21af6782932ebcab..467a90369772c9687bbf09840668f2ca73d39785 100644
--- a/chrome/browser/ui/omnibox/omnibox_popup_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_popup_model.cc
@@ -193,13 +193,15 @@ void OmniboxPopupModel::TryDeletingCurrentItem() {
}
}
-const SkBitmap* OmniboxPopupModel::GetIconIfExtensionMatch(
+gfx::Image OmniboxPopupModel::GetIconIfExtensionMatch(
const AutocompleteMatch& match) const {
Profile* profile = edit_model_->profile();
const TemplateURL* template_url = match.GetTemplateURL(profile);
- return (template_url && template_url->IsExtensionKeyword()) ?
- &profile->GetExtensionService()->GetOmniboxPopupIcon(
- template_url->GetExtensionId()) : NULL;
+ if (template_url && template_url->IsExtensionKeyword()) {
+ return profile->GetExtensionService()->GetOmniboxPopupIcon(
+ template_url->GetExtensionId());
+ }
+ return gfx::Image();
}
void OmniboxPopupModel::OnResultChanged() {

Powered by Google App Engine
This is Rietveld 408576698