| Index: chrome/browser/ui/gtk/browser_window_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
|
| index 9a36032a6ea72e152d0d70a5c5c9ce5e5261f74e..f1de528c9346eb25712a1a3afa89914671956c33 100644
|
| --- a/chrome/browser/ui/gtk/browser_window_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
|
| @@ -57,7 +57,6 @@
|
| #include "chrome/browser/ui/gtk/find_bar_gtk.h"
|
| #include "chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h"
|
| #include "chrome/browser/ui/gtk/global_menu_bar.h"
|
| -#include "chrome/browser/ui/gtk/gtk_theme_service.h"
|
| #include "chrome/browser/ui/gtk/gtk_util.h"
|
| #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h"
|
| #include "chrome/browser/ui/gtk/infobars/infobar_gtk.h"
|
| @@ -68,6 +67,7 @@
|
| #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
|
| #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
|
| #include "chrome/browser/ui/gtk/task_manager_gtk.h"
|
| +#include "chrome/browser/ui/gtk/theme_service_gtk.h"
|
| #include "chrome/browser/ui/gtk/update_recommended_dialog.h"
|
| #include "chrome/browser/ui/omnibox/location_bar.h"
|
| #include "chrome/browser/ui/omnibox/omnibox_view.h"
|
| @@ -614,7 +614,7 @@ void BrowserWindowGtk::DrawPopupFrame(cairo_t* cr,
|
| void BrowserWindowGtk::DrawCustomFrame(cairo_t* cr,
|
| GtkWidget* widget,
|
| GdkEventExpose* event) {
|
| - GtkThemeService* theme_provider = GtkThemeService::GetFrom(
|
| + ThemeServiceGtk* theme_provider = ThemeServiceGtk::GetFrom(
|
| browser()->profile());
|
|
|
| int image_name = GetThemeFrameResource();
|
| @@ -1352,7 +1352,7 @@ void BrowserWindowGtk::ActiveWindowChanged(GdkWindow* active_window) {
|
| }
|
|
|
| SkColor BrowserWindowGtk::GetInfoBarSeparatorColor() const {
|
| - GtkThemeService* theme_service = GtkThemeService::GetFrom(
|
| + ThemeServiceGtk* theme_service = ThemeServiceGtk::GetFrom(
|
| browser()->profile());
|
| return gfx::GdkColorToSkColor(theme_service->GetBorderColor());
|
| }
|
| @@ -1908,7 +1908,7 @@ void BrowserWindowGtk::InitWidgets() {
|
|
|
| void BrowserWindowGtk::SetBackgroundColor() {
|
| Profile* profile = browser()->profile();
|
| - GtkThemeService* theme_provider = GtkThemeService::GetFrom(profile);
|
| + ThemeServiceGtk* theme_provider = ThemeServiceGtk::GetFrom(profile);
|
| int frame_color_id;
|
| if (UsingCustomPopupFrame()) {
|
| frame_color_id = ThemeService::COLOR_TOOLBAR;
|
| @@ -2409,7 +2409,7 @@ bool BrowserWindowGtk::IsBookmarkBarSupported() const {
|
| }
|
|
|
| bool BrowserWindowGtk::UsingCustomPopupFrame() const {
|
| - GtkThemeService* theme_provider = GtkThemeService::GetFrom(
|
| + ThemeServiceGtk* theme_provider = ThemeServiceGtk::GetFrom(
|
| browser()->profile());
|
| return !theme_provider->UsingNativeTheme() &&
|
| (browser()->is_type_popup() || browser()->is_type_panel());
|
|
|