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

Unified Diff: chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc

Issue 9424024: Force browser action icon size to always be 19px (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Small change to comment. Created 8 years, 10 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/gtk/browser_actions_toolbar_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index 5ae03d64722768f2825c8efb682c4fb9f25086bf..62b3b8231d861b6556da79aab02e36fa1e052754 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -37,6 +37,7 @@
#include "grit/theme_resources_standard.h"
#include "grit/ui_resources.h"
#include "ui/base/gtk/gtk_compat.h"
+#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas_skia_paint.h"
#include "ui/gfx/gtk_util.h"
@@ -117,6 +118,12 @@ class BrowserActionButton : public content::NotificationObserver,
gfx::Size(Extension::kBrowserActionIconMaxSize,
Extension::kBrowserActionIconMaxSize),
ImageLoadingTracker::DONT_CACHE);
+ } else {
+ SkBitmap bm = *ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ IDR_EXTENSIONS_FAVICON);
+ default_skbitmap_ = bm;
+ default_icon_ = gfx::GdkPixbufFromSkBitmap(&bm);
+ UpdateState();
}
signals_.Connect(button(), "button-press-event",

Powered by Google App Engine
This is Rietveld 408576698