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

Unified Diff: chrome/browser/gtk/page_info_window_gtk.cc

Issue 3560004: Refactor the code for loading icons into the PageInfoModel. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: cleanup Created 10 years, 3 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
« no previous file with comments | « chrome/browser/gtk/page_info_bubble_gtk.cc ('k') | chrome/browser/page_info_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/page_info_window_gtk.cc
diff --git a/chrome/browser/gtk/page_info_window_gtk.cc b/chrome/browser/gtk/page_info_window_gtk.cc
index 9eaa63e881fc22c2b2d9bb8fb1b17eb7416783a7..2b8748392de2914e25a58b2a8c29317067687ad1 100644
--- a/chrome/browser/gtk/page_info_window_gtk.cc
+++ b/chrome/browser/gtk/page_info_window_gtk.cc
@@ -7,7 +7,6 @@
#include "build/build_config.h"
#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
#include "base/compiler_specific.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/certificate_viewer.h"
@@ -16,7 +15,6 @@
#include "chrome/browser/page_info_window.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
-#include "grit/theme_resources.h"
namespace {
@@ -148,11 +146,8 @@ GtkWidget* PageInfoWindowGtk::CreateSection(
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
GtkWidget* section_box = gtk_hbox_new(FALSE, 0);
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
GtkWidget* image = gtk_image_new_from_pixbuf(
- section.state == PageInfoModel::SECTION_STATE_OK ?
- rb.GetPixbufNamed(IDR_PAGEINFO_GOOD) :
- rb.GetPixbufNamed(IDR_PAGEINFO_WARNING_MAJOR));
+ model_.GetIconImage(section.icon_id));
gtk_box_pack_start(GTK_BOX(section_box), image, FALSE, FALSE,
gtk_util::kControlSpacing);
gtk_misc_set_alignment(GTK_MISC(image), 0, 0);
« no previous file with comments | « chrome/browser/gtk/page_info_bubble_gtk.cc ('k') | chrome/browser/page_info_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698