| Index: chrome/browser/ui/gtk/overflow_button.cc
|
| diff --git a/chrome/browser/ui/gtk/overflow_button.cc b/chrome/browser/ui/gtk/overflow_button.cc
|
| index a1057b287ba0a467c1c851d74666500a153c9e7a..cadbb36b6123a48444d5bcad50f5f11242d8c57e 100644
|
| --- a/chrome/browser/ui/gtk/overflow_button.cc
|
| +++ b/chrome/browser/ui/gtk/overflow_button.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -7,17 +7,17 @@
|
| #include <gtk/gtk.h>
|
|
|
| #include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/ui/gtk/gtk_theme_service.h"
|
| +#include "chrome/browser/ui/gtk/theme_service_gtk.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "content/public/browser/notification_source.h"
|
| #include "grit/theme_resources.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| OverflowButton::OverflowButton(Profile* profile) : profile_(profile) {
|
| - widget_.Own(GtkThemeService::GetFrom(profile)->BuildChromeButton());
|
| + widget_.Own(ThemeServiceGtk::GetFrom(profile)->BuildChromeButton());
|
| gtk_widget_set_no_show_all(widget_.get(), TRUE);
|
|
|
| - GtkThemeService* theme_service = GtkThemeService::GetFrom(profile);
|
| + ThemeServiceGtk* theme_service = ThemeServiceGtk::GetFrom(profile);
|
| registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
|
| content::Source<ThemeService>(theme_service));
|
| theme_service->InitThemesFor(this);
|
| @@ -35,7 +35,7 @@ void OverflowButton::Observe(int type,
|
| gtk_widget_destroy(former_child);
|
|
|
| GtkWidget* new_child =
|
| - GtkThemeService::GetFrom(profile_)->UsingNativeTheme() ?
|
| + ThemeServiceGtk::GetFrom(profile_)->UsingNativeTheme() ?
|
| gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE) :
|
| gtk_image_new_from_pixbuf(ui::ResourceBundle::GetSharedInstance().
|
| GetRTLEnabledPixbufNamed(IDR_BOOKMARK_BAR_CHEVRONS));
|
|
|