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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_result_view.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/views/omnibox/omnibox_result_view.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
index 5a1e989e0561ab4180212d1185c858deab699de0..d6ec40ea68040c47d5172a546ef48e1bd6ca6723 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
@@ -277,10 +277,10 @@ bool OmniboxResultView::SortRunsVisually(const RunData& lhs,
// static
int OmniboxResultView::default_icon_size_ = 0;
-const SkBitmap* OmniboxResultView::GetIcon() const {
- const SkBitmap* bitmap = model_->GetIconIfExtensionMatch(model_index_);
- if (bitmap)
- return bitmap;
+gfx::ImageSkia OmniboxResultView::GetIcon() const {
+ const gfx::Image image = model_->GetIconIfExtensionMatch(model_index_);
+ if (!image.IsEmpty())
+ return image.AsImageSkia();
int icon = match_.starred ?
IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match_.type);
@@ -303,7 +303,7 @@ const SkBitmap* OmniboxResultView::GetIcon() const {
break;
}
}
- return ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(icon);
+ return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon);
}
const gfx::ImageSkia* OmniboxResultView::GetKeywordIcon() const {
@@ -561,12 +561,12 @@ void OmniboxResultView::Elide(Runs* runs, int remaining_width) const {
}
void OmniboxResultView::Layout() {
- const SkBitmap* icon = GetIcon();
+ const gfx::ImageSkia icon = GetIcon();
icon_bounds_.SetRect(edge_item_padding_ +
- ((icon->width() == default_icon_size_) ?
+ ((icon.width() == default_icon_size_) ?
0 : LocationBarView::kIconInternalPadding),
- (height() - icon->height()) / 2, icon->width(), icon->height());
+ (height() - icon.height()) / 2, icon.width(), icon.height());
int text_x = edge_item_padding_ + default_icon_size_ + item_padding_;
int text_height = GetTextHeight();
@@ -605,7 +605,7 @@ void OmniboxResultView::OnPaint(gfx::Canvas* canvas) {
if (!match_.associated_keyword.get() ||
keyword_icon_->x() > icon_bounds_.right()) {
// Paint the icon.
- canvas->DrawImageInt(*GetIcon(), GetMirroredXForRect(icon_bounds_),
+ canvas->DrawImageInt(GetIcon(), GetMirroredXForRect(icon_bounds_),
icon_bounds_.y());
// Paint the text.

Powered by Google App Engine
This is Rietveld 408576698