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

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

Issue 10337010: Revert r123782. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 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/ui/gtk/gtk_theme_service_unittest.cc ('k') | chrome/browser/ui/gtk/gtk_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/gtk_tree.cc
diff --git a/chrome/browser/ui/gtk/gtk_tree.cc b/chrome/browser/ui/gtk/gtk_tree.cc
index b2c1dd54c195d2e7c0c6d8f05e1b0b262c848dd4..f198d8ad40b0aeef1471ac3551f1a5853ee62c95 100644
--- a/chrome/browser/ui/gtk/gtk_tree.cc
+++ b/chrome/browser/ui/gtk/gtk_tree.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/ui/gtk/theme_service_gtk.h"
+#include "chrome/browser/ui/gtk/gtk_theme_service.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/models/table_model.h"
#include "ui/gfx/gtk_util.h"
@@ -384,7 +384,7 @@ void TreeAdapter::FillRow(GtkTreeIter* iter, ui::TreeModelNode* node) {
if (icon_index >= 0 && icon_index < static_cast<int>(pixbufs_.size()))
pixbuf = pixbufs_[icon_index];
else
- pixbuf = ThemeServiceGtk::GetFolderIcon(true)->ToGdkPixbuf();
+ pixbuf = GtkThemeService::GetFolderIcon(true)->ToGdkPixbuf();
gtk_tree_store_set(tree_store_, iter,
COL_ICON, pixbuf,
COL_TITLE, UTF16ToUTF8(node->GetTitle()).c_str(),
« no previous file with comments | « chrome/browser/ui/gtk/gtk_theme_service_unittest.cc ('k') | chrome/browser/ui/gtk/gtk_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698