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

Unified Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

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/cocoa/location_bar/location_bar_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index 129985c3c6266b4de024db13d6db8bc16d82c768..3afa432d6fd71f133f852960b6f39712c481ba0c 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
@@ -64,7 +64,6 @@
#include "grit/theme_resources.h"
#include "net/base/net_util.h"
#include "skia/ext/skia_utils_mac.h"
-#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image.h"
@@ -550,9 +549,8 @@ NSImage* LocationBarViewMac::GetKeywordImage(const string16& keyword) {
const TemplateURL* template_url = TemplateURLServiceFactory::GetForProfile(
profile_)->GetTemplateURLForKeyword(keyword);
if (template_url && template_url->IsExtensionKeyword()) {
- const SkBitmap& bitmap = profile_->GetExtensionService()->
- GetOmniboxIcon(template_url->GetExtensionId());
- return gfx::SkBitmapToNSImage(bitmap);
+ return profile_->GetExtensionService()->GetOmniboxIcon(
+ template_url->GetExtensionId()).AsNSImage();
}
return OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);

Powered by Google App Engine
This is Rietveld 408576698