| Index: chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
|
| index 16dfdc869a21e18675b9649816ad5b8dbd0fb377..a3bf332e3b5688b012a4d2917e62475beb19e88d 100644
|
| --- a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
|
| @@ -13,8 +13,8 @@
|
| #include "chrome/browser/bookmarks/bookmark_utils.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
|
| -#include "chrome/browser/ui/gtk/gtk_theme_service.h"
|
| #include "chrome/browser/ui/gtk/gtk_util.h"
|
| +#include "chrome/browser/ui/gtk/theme_service_gtk.h"
|
| #include "ui/base/dragdrop/gtk_dnd_util.h"
|
| #include "ui/base/gtk/gtk_hig_constants.h"
|
| #include "ui/base/gtk/gtk_screen_utils.h"
|
| @@ -53,7 +53,7 @@ void* AsVoid(const BookmarkNode* node) {
|
|
|
| // Creates the widget hierarchy for a bookmark button.
|
| void PackButton(GdkPixbuf* pixbuf, const string16& title, bool ellipsize,
|
| - GtkThemeService* provider, GtkWidget* button) {
|
| + ThemeServiceGtk* provider, GtkWidget* button) {
|
| GtkWidget* former_child = gtk_bin_get_child(GTK_BIN(button));
|
| if (former_child)
|
| gtk_container_remove(GTK_CONTAINER(button), former_child);
|
| @@ -171,11 +171,11 @@ GdkPixbuf* GetPixbufForNode(const BookmarkNode* node, BookmarkModel* model,
|
| if (model->GetFavicon(node).width() != 0) {
|
| pixbuf = gfx::GdkPixbufFromSkBitmap(&model->GetFavicon(node));
|
| } else {
|
| - pixbuf = GtkThemeService::GetDefaultFavicon(native)->ToGdkPixbuf();
|
| + pixbuf = ThemeServiceGtk::GetDefaultFavicon(native)->ToGdkPixbuf();
|
| g_object_ref(pixbuf);
|
| }
|
| } else {
|
| - pixbuf = GtkThemeService::GetFolderIcon(native)->ToGdkPixbuf();
|
| + pixbuf = ThemeServiceGtk::GetFolderIcon(native)->ToGdkPixbuf();
|
| g_object_ref(pixbuf);
|
| }
|
|
|
| @@ -184,7 +184,7 @@ GdkPixbuf* GetPixbufForNode(const BookmarkNode* node, BookmarkModel* model,
|
|
|
| GtkWidget* GetDragRepresentation(GdkPixbuf* pixbuf,
|
| const string16& title,
|
| - GtkThemeService* provider) {
|
| + ThemeServiceGtk* provider) {
|
| GtkWidget* window = gtk_window_new(GTK_WINDOW_POPUP);
|
|
|
| if (ui::IsScreenComposited() &&
|
| @@ -224,7 +224,7 @@ GtkWidget* GetDragRepresentation(GdkPixbuf* pixbuf,
|
|
|
| GtkWidget* GetDragRepresentationForNode(const BookmarkNode* node,
|
| BookmarkModel* model,
|
| - GtkThemeService* provider) {
|
| + ThemeServiceGtk* provider) {
|
| GdkPixbuf* pixbuf = GetPixbufForNode(
|
| node, model, provider->UsingNativeTheme());
|
| GtkWidget* widget = GetDragRepresentation(pixbuf, node->GetTitle(), provider);
|
| @@ -233,7 +233,7 @@ GtkWidget* GetDragRepresentationForNode(const BookmarkNode* node,
|
| }
|
|
|
| void ConfigureButtonForNode(const BookmarkNode* node, BookmarkModel* model,
|
| - GtkWidget* button, GtkThemeService* provider) {
|
| + GtkWidget* button, ThemeServiceGtk* provider) {
|
| GdkPixbuf* pixbuf = bookmark_utils::GetPixbufForNode(
|
| node, model, provider->UsingNativeTheme());
|
| PackButton(pixbuf, node->GetTitle(), node != model->other_node(), provider,
|
| @@ -275,7 +275,7 @@ const BookmarkNode* BookmarkNodeForWidget(GtkWidget* widget) {
|
| g_object_get_data(G_OBJECT(widget), bookmark_utils::kBookmarkNode));
|
| }
|
|
|
| -void SetButtonTextColors(GtkWidget* label, GtkThemeService* provider) {
|
| +void SetButtonTextColors(GtkWidget* label, ThemeServiceGtk* provider) {
|
| if (provider->UsingNativeTheme()) {
|
| gtk_util::SetLabelColor(label, NULL);
|
| } else {
|
|
|