summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 21:05:27 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 21:05:27 +0000
commit6f10f9c6bb0557b1171d5073f82b23dadbd1dfe2 (patch)
treef12962cd046a7df77c164e474e979e0c0a636c24
parent29548d8d4f224f681c70e85a7fa0466dff4df92f (diff)
downloadchromium_src-6f10f9c6bb0557b1171d5073f82b23dadbd1dfe2.zip
chromium_src-6f10f9c6bb0557b1171d5073f82b23dadbd1dfe2.tar.gz
chromium_src-6f10f9c6bb0557b1171d5073f82b23dadbd1dfe2.tar.bz2
gtk: Call ResourceBundle::GetNativeImageNamed() instead of GetPixbufNamed() on browser_titlebar.cc.
BUG=58030 TEST=None R=evan@chromium.org,rsesek@chromium.org Review URL: http://codereview.chromium.org/6904137 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83589 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/gtk/browser_titlebar.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc
index be8f26a..14e6d4d 100644
--- a/chrome/browser/ui/gtk/browser_titlebar.cc
+++ b/chrome/browser/ui/gtk/browser_titlebar.cc
@@ -43,6 +43,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/gtk_util.h"
+#include "ui/gfx/image.h"
#include "ui/gfx/skbitmap_operations.h"
namespace {
@@ -584,7 +585,7 @@ void BrowserTitlebar::UpdateThrobber(TabContents* tab_contents) {
if (icon.empty()) {
// Fallback to the Chromium icon if the page has no icon.
gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_),
- rb.GetPixbufNamed(IDR_PRODUCT_LOGO_16));
+ rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16));
} else {
GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_), icon_pixbuf);
@@ -592,7 +593,7 @@ void BrowserTitlebar::UpdateThrobber(TabContents* tab_contents) {
}
} else {
gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_),
- rb.GetPixbufNamed(IDR_PRODUCT_LOGO_16));
+ rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16));
}
throbber_.Reset();
}