summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc2
-rw-r--r--chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc2
-rw-r--r--chrome/browser/ui/gtk/browser_titlebar.cc2
-rw-r--r--chrome/browser/ui/gtk/browser_toolbar_gtk.cc10
-rw-r--r--chrome/browser/ui/gtk/browser_window_gtk.cc2
-rw-r--r--chrome/browser/ui/gtk/bubble/bubble_gtk.cc2
-rw-r--r--chrome/browser/ui/gtk/custom_button.cc2
-rw-r--r--chrome/browser/ui/gtk/download/download_item_gtk.cc24
-rw-r--r--chrome/browser/ui/gtk/download/download_shelf_gtk.cc3
-rw-r--r--chrome/browser/ui/gtk/find_bar_gtk.cc8
-rw-r--r--chrome/browser/ui/gtk/first_run_bubble.cc2
-rw-r--r--chrome/browser/ui/gtk/location_bar_view_gtk.cc6
-rw-r--r--chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc6
-rw-r--r--chrome/browser/ui/gtk/overflow_button.cc2
-rw-r--r--chrome/browser/ui/gtk/page_info_bubble_gtk.cc4
-rw-r--r--chrome/browser/ui/gtk/reload_button_gtk.cc4
-rw-r--r--chrome/browser/ui/gtk/status_bubble_gtk.cc2
-rw-r--r--chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc2
-rw-r--r--chrome/browser/ui/webui/options/personal_options_handler.cc8
19 files changed, 48 insertions, 45 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
index d375f02..26a5695 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
@@ -394,7 +394,7 @@ void AutocompletePopupViewGtk::Observe(NotificationType type,
const NotificationDetails& details) {
DCHECK(type == NotificationType::BROWSER_THEME_CHANGED);
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
gtk_util::UndoForceFontSize(window_);
border_color_ = theme_service_->GetBorderColor();
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index 9a72fba..38ca6dc 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -478,7 +478,7 @@ void BrowserActionsToolbarGtk::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
DCHECK(NotificationType::BROWSER_THEME_CHANGED == type);
- if (theme_service_->UseGtkTheme())
+ if (theme_service_->UsingNativeTheme())
gtk_widget_show(separator_);
else
gtk_widget_hide(separator_);
diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc
index 9680736..be8f26a 100644
--- a/chrome/browser/ui/gtk/browser_titlebar.cc
+++ b/chrome/browser/ui/gtk/browser_titlebar.cc
@@ -676,7 +676,7 @@ void BrowserTitlebar::UpdateTextColor() {
if (!app_mode_title_)
return;
- if (theme_service_ && theme_service_->UseGtkTheme()) {
+ if (theme_service_ && theme_service_->UsingNativeTheme()) {
// We don't really have any good options here.
//
// Colors from window manager themes aren't exposed in GTK; the window
diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
index b6e02d8..37fcb55 100644
--- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc
@@ -131,7 +131,7 @@ void BrowserToolbarGtk::Init(Profile* profile,
event_box_ = gtk_event_box_new();
// Make the event box transparent so themes can use transparent toolbar
// backgrounds.
- if (!theme_service_->UseGtkTheme())
+ if (!theme_service_->UsingNativeTheme())
gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_), FALSE);
toolbar_ = gtk_hbox_new(FALSE, 0);
@@ -346,7 +346,7 @@ void BrowserToolbarGtk::Observe(NotificationType type,
NotifyPrefChanged(Details<std::string>(details).ptr());
} else if (type == NotificationType::BROWSER_THEME_CHANGED) {
// Update the spacing around the menu buttons
- bool use_gtk = theme_service_->UseGtkTheme();
+ bool use_gtk = theme_service_->UsingNativeTheme();
int border = use_gtk ? 0 : 2;
gtk_container_set_border_width(
GTK_CONTAINER(wrench_menu_button_->widget()), border);
@@ -429,7 +429,7 @@ bool BrowserToolbarGtk::UpdateRoundedness() {
// We still round the corners if we are in chrome theme mode, but we do it by
// drawing theme resources rather than changing the physical shape of the
// widget.
- bool should_be_rounded = theme_service_->UseGtkTheme() &&
+ bool should_be_rounded = theme_service_->UsingNativeTheme() &&
window_->ShouldDrawContentDropShadow();
if (should_be_rounded == gtk_util::IsActingAsRoundedWindow(alignment_))
@@ -454,7 +454,7 @@ gboolean BrowserToolbarGtk::OnAlignmentExpose(GtkWidget* widget,
return TRUE;
// We don't need to render the toolbar image in GTK mode.
- if (theme_service_->UseGtkTheme())
+ if (theme_service_->UsingNativeTheme())
return FALSE;
cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
@@ -555,7 +555,7 @@ gboolean BrowserToolbarGtk::OnAlignmentExpose(GtkWidget* widget,
gboolean BrowserToolbarGtk::OnLocationHboxExpose(GtkWidget* location_hbox,
GdkEventExpose* e) {
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
gtk_util::DrawTextEntryBackground(offscreen_entry_.get(),
location_hbox, &e->area,
&location_hbox->allocation);
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 4f8a0ba..71a44df 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -2238,7 +2238,7 @@ bool BrowserWindowGtk::IsBookmarkBarSupported() const {
bool BrowserWindowGtk::UsingCustomPopupFrame() const {
GtkThemeService* theme_provider = GtkThemeService::GetFrom(
browser()->profile());
- return !theme_provider->UseGtkTheme() &&
+ return !theme_provider->UsingNativeTheme() &&
browser()->type() & Browser::TYPE_POPUP;
}
diff --git a/chrome/browser/ui/gtk/bubble/bubble_gtk.cc b/chrome/browser/ui/gtk/bubble/bubble_gtk.cc
index 95155ad..30dc9d6 100644
--- a/chrome/browser/ui/gtk/bubble/bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/bubble/bubble_gtk.cc
@@ -347,7 +347,7 @@ void BubbleGtk::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
DCHECK_EQ(type.value, NotificationType::BROWSER_THEME_CHANGED);
- if (theme_service_->UseGtkTheme() && match_system_theme_) {
+ if (theme_service_->UsingNativeTheme() && match_system_theme_) {
gtk_widget_modify_bg(window_, GTK_STATE_NORMAL, NULL);
} else {
// Set the background color, so we don't need to paint it manually.
diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc
index 4bdd1e8..027d71f 100644
--- a/chrome/browser/ui/gtk/custom_button.cc
+++ b/chrome/browser/ui/gtk/custom_button.cc
@@ -341,5 +341,5 @@ void CustomDrawButton::SetBrowserTheme() {
}
bool CustomDrawButton::UseGtkTheme() {
- return theme_service_ && theme_service_->UseGtkTheme();
+ return theme_service_ && theme_service_->UsingNativeTheme();
}
diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc
index eafff90..ccdd4ac 100644
--- a/chrome/browser/ui/gtk/download/download_item_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc
@@ -460,7 +460,7 @@ void DownloadItemGtk::Observe(NotificationType type,
if (type == NotificationType::BROWSER_THEME_CHANGED) {
// Our GtkArrow is only visible in gtk mode. Otherwise, we let the custom
// rendering code do whatever it wants.
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
if (!arrow_) {
arrow_ = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gtk_widget_set_size_request(arrow_,
@@ -560,8 +560,9 @@ void DownloadItemGtk::UpdateNameLabel() {
GdkColor color = theme_service_->GetGdkColor(
ThemeService::COLOR_BOOKMARK_TEXT);
- gtk_util::SetLabelColor(name_label_, theme_service_->UseGtkTheme() ?
- NULL : &color);
+ gtk_util::SetLabelColor(
+ name_label_,
+ theme_service_->UsingNativeTheme() ? NULL : &color);
gtk_label_set_text(GTK_LABEL(name_label_),
UTF16ToUTF8(elided_filename).c_str());
}
@@ -571,7 +572,7 @@ void DownloadItemGtk::UpdateStatusLabel(const std::string& status_text) {
return;
GdkColor text_color;
- if (!theme_service_->UseGtkTheme()) {
+ if (!theme_service_->UsingNativeTheme()) {
SkColor color = theme_service_->GetColor(
ThemeService::COLOR_BOOKMARK_TEXT);
if (color_utils::RelativeLuminance(color) > 0.5) {
@@ -591,8 +592,9 @@ void DownloadItemGtk::UpdateStatusLabel(const std::string& status_text) {
color_utils::AlphaBlend(blend_color, color, 77));
}
- gtk_util::SetLabelColor(status_label_, theme_service_->UseGtkTheme() ?
- NULL : &text_color);
+ gtk_util::SetLabelColor(
+ status_label_,
+ theme_service_->UsingNativeTheme() ? NULL : &text_color);
gtk_label_set_text(GTK_LABEL(status_label_), status_text.c_str());
}
@@ -624,7 +626,7 @@ void DownloadItemGtk::UpdateDangerWarning() {
}
}
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
gtk_util::SetLabelColor(dangerous_label_, NULL);
} else {
GdkColor color = theme_service_->GetGdkColor(
@@ -659,7 +661,7 @@ void DownloadItemGtk::UpdateDangerWarning() {
}
void DownloadItemGtk::UpdateDangerIcon() {
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
const char* stock =
get_download()->danger_type() == DownloadItem::DANGEROUS_URL ?
GTK_STOCK_DIALOG_ERROR : GTK_STOCK_DIALOG_WARNING;
@@ -742,7 +744,7 @@ void DownloadItemGtk::InitNineBoxes() {
}
gboolean DownloadItemGtk::OnHboxExpose(GtkWidget* widget, GdkEventExpose* e) {
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
int border_width = GTK_CONTAINER(widget)->border_width;
int x = widget->allocation.x + border_width;
int y = widget->allocation.y + border_width;
@@ -811,7 +813,7 @@ gboolean DownloadItemGtk::OnHboxExpose(GtkWidget* widget, GdkEventExpose* e) {
}
gboolean DownloadItemGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e) {
- if (!theme_service_->UseGtkTheme()) {
+ if (!theme_service_->UsingNativeTheme()) {
bool is_body = widget == body_.get();
NineBox* nine_box = NULL;
@@ -917,7 +919,7 @@ void DownloadItemGtk::ShowPopupMenu(GtkWidget* button,
gboolean DownloadItemGtk::OnDangerousPromptExpose(GtkWidget* widget,
GdkEventExpose* event) {
- if (!theme_service_->UseGtkTheme()) {
+ if (!theme_service_->UsingNativeTheme()) {
// The hbox renderer will take care of the border when in GTK mode.
dangerous_nine_box_->RenderToWidget(widget);
}
diff --git a/chrome/browser/ui/gtk/download/download_shelf_gtk.cc b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
index d808557..8f27e04 100644
--- a/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
@@ -231,7 +231,8 @@ void DownloadShelfGtk::Observe(NotificationType type,
gtk_widget_modify_bg(top_border_, GTK_STATE_NORMAL, &color);
gtk_chrome_link_button_set_use_gtk_theme(
- GTK_CHROME_LINK_BUTTON(link_button_), theme_service_->UseGtkTheme());
+ GTK_CHROME_LINK_BUTTON(link_button_),
+ theme_service_->UsingNativeTheme());
// When using a non-standard, non-gtk theme, we make the link color match
// the bookmark text color. Otherwise, standard link blue can look very
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc
index 5487d9f..042959b 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/find_bar_gtk.cc
@@ -468,7 +468,7 @@ void FindBarGtk::Observe(NotificationType type,
container_width_ = -1;
container_height_ = -1;
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
gtk_widget_modify_cursor(text_entry_, NULL, NULL);
gtk_widget_modify_base(text_entry_, GTK_STATE_NORMAL, NULL);
gtk_widget_modify_text(text_entry_, GTK_STATE_NORMAL, NULL);
@@ -602,7 +602,7 @@ void FindBarGtk::FindEntryTextInContents(bool forward_search) {
void FindBarGtk::UpdateMatchLabelAppearance(bool failure) {
match_label_failure_ = failure;
- bool use_gtk = theme_service_->UseGtkTheme();
+ bool use_gtk = theme_service_->UsingNativeTheme();
if (use_gtk) {
GtkStyle* style = gtk_rc_get_style(text_entry_);
@@ -812,7 +812,7 @@ void FindBarGtk::OnClicked(GtkWidget* button, FindBarGtk* find_bar) {
gboolean FindBarGtk::OnContentEventBoxExpose(GtkWidget* widget,
GdkEventExpose* event,
FindBarGtk* bar) {
- if (bar->theme_service_->UseGtkTheme()) {
+ if (bar->theme_service_->UsingNativeTheme()) {
// Draw the text entry background around where we input stuff. Note the
// decrement to |width|. We do this because some theme engines
// (*cough*Clearlooks*cough*) don't do any blending and use thickness to
@@ -839,7 +839,7 @@ gboolean FindBarGtk::OnExpose(GtkWidget* widget, GdkEventExpose* e,
gtk_widget_size_request(widget, &req);
gtk_widget_set_size_request(bar->widget(), req.width, -1);
- if (bar->theme_service_->UseGtkTheme()) {
+ if (bar->theme_service_->UsingNativeTheme()) {
if (bar->container_width_ != widget->allocation.width ||
bar->container_height_ != widget->allocation.height) {
std::vector<GdkPoint> mask_points = MakeFramePolygonPoints(
diff --git a/chrome/browser/ui/gtk/first_run_bubble.cc b/chrome/browser/ui/gtk/first_run_bubble.cc
index d00824b..17d23b0 100644
--- a/chrome/browser/ui/gtk/first_run_bubble.cc
+++ b/chrome/browser/ui/gtk/first_run_bubble.cc
@@ -53,7 +53,7 @@ void FirstRunBubble::Observe(NotificationType type,
const NotificationDetails& details) {
DCHECK(type == NotificationType::BROWSER_THEME_CHANGED);
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
for (std::vector<GtkWidget*>::iterator it = labels_.begin();
it != labels_.end(); ++it) {
gtk_widget_modify_fg(*it, GTK_STATE_NORMAL, NULL);
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index 6290df6..0ef6215 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -448,7 +448,7 @@ void LocationBarViewGtk::Update(const TabContents* contents) {
UpdatePageActions();
location_entry_->Update(contents);
// The security level (background color) could have changed, etc.
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
// In GTK mode, we need our parent to redraw, as it draws the text entry
// border.
gtk_widget_queue_draw(widget()->parent);
@@ -762,7 +762,7 @@ void LocationBarViewGtk::Observe(NotificationType type,
DCHECK_EQ(type.value, NotificationType::BROWSER_THEME_CHANGED);
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
gtk_widget_modify_bg(tab_to_search_box_, GTK_STATE_NORMAL, NULL);
GdkColor border_color = theme_service_->GetGdkColor(
@@ -832,7 +832,7 @@ gboolean LocationBarViewGtk::HandleExpose(GtkWidget* widget,
// If we're not using GTK theming, draw our own border over the edge pixels
// of the background.
if (!profile_ ||
- !GtkThemeService::GetFrom(profile_)->UseGtkTheme()) {
+ !GtkThemeService::GetFrom(profile_)->UsingNativeTheme()) {
int left, center, right;
if (popup_window_mode_) {
left = right = IDR_LOCATIONBG_POPUPMODE_EDGE;
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
index 8976ebc..7843277 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
@@ -941,7 +941,7 @@ void OmniboxViewGtk::SetBaseColor() {
#if defined(TOOLKIT_VIEWS)
bool use_gtk = false;
#else
- bool use_gtk = theme_service_->UseGtkTheme();
+ bool use_gtk = theme_service_->UsingNativeTheme();
#endif
if (use_gtk) {
gtk_widget_modify_cursor(text_view_, NULL, NULL);
@@ -1019,7 +1019,7 @@ void OmniboxViewGtk::UpdateInstantViewColors() {
#if defined(TOOLKIT_VIEWS)
bool use_gtk = false;
#else
- bool use_gtk = theme_service_->UseGtkTheme();
+ bool use_gtk = theme_service_->UsingNativeTheme();
#endif
if (use_gtk) {
@@ -1788,7 +1788,7 @@ gfx::Font OmniboxViewGtk::GetFont() {
#if defined(TOOLKIT_VIEWS)
bool use_gtk = false;
#else
- bool use_gtk = theme_service_->UseGtkTheme();
+ bool use_gtk = theme_service_->UsingNativeTheme();
#endif
if (use_gtk) {
diff --git a/chrome/browser/ui/gtk/overflow_button.cc b/chrome/browser/ui/gtk/overflow_button.cc
index c2cab94..d1e57bd 100644
--- a/chrome/browser/ui/gtk/overflow_button.cc
+++ b/chrome/browser/ui/gtk/overflow_button.cc
@@ -34,7 +34,7 @@ void OverflowButton::Observe(NotificationType type,
gtk_widget_destroy(former_child);
GtkWidget* new_child =
- GtkThemeService::GetFrom(profile_)->UseGtkTheme() ?
+ GtkThemeService::GetFrom(profile_)->UsingNativeTheme() ?
gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE) :
gtk_image_new_from_pixbuf(ResourceBundle::GetSharedInstance().
GetRTLEnabledPixbufNamed(IDR_BOOKMARK_BAR_CHEVRONS));
diff --git a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
index 7ca4cb1..f30335a 100644
--- a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
@@ -159,10 +159,10 @@ void PageInfoBubbleGtk::Observe(NotificationType type,
it != links_.end(); ++it) {
gtk_chrome_link_button_set_use_gtk_theme(
GTK_CHROME_LINK_BUTTON(*it),
- theme_service_->UseGtkTheme());
+ theme_service_->UsingNativeTheme());
}
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
for (std::vector<GtkWidget*>::iterator it = labels_.begin();
it != labels_.end(); ++it) {
gtk_widget_modify_fg(*it, GTK_STATE_NORMAL, NULL);
diff --git a/chrome/browser/ui/gtk/reload_button_gtk.cc b/chrome/browser/ui/gtk/reload_button_gtk.cc
index 0401f62..9dd6a36 100644
--- a/chrome/browser/ui/gtk/reload_button_gtk.cc
+++ b/chrome/browser/ui/gtk/reload_button_gtk.cc
@@ -195,7 +195,7 @@ void ReloadButtonGtk::OnClicked(GtkWidget* /* sender */) {
gboolean ReloadButtonGtk::OnExpose(GtkWidget* widget,
GdkEventExpose* e) {
- if (theme_service_ && theme_service_->UseGtkTheme())
+ if (theme_service_ && theme_service_->UsingNativeTheme())
return FALSE;
return ((visible_mode_ == MODE_RELOAD) ? reload_ : stop_).OnExpose(
widget, e, hover_controller_.GetCurrentValue());
@@ -223,7 +223,7 @@ gboolean ReloadButtonGtk::OnQueryTooltip(GtkWidget* /* sender */,
}
void ReloadButtonGtk::UpdateThemeButtons() {
- bool use_gtk = theme_service_ && theme_service_->UseGtkTheme();
+ bool use_gtk = theme_service_ && theme_service_->UsingNativeTheme();
if (use_gtk) {
gtk_widget_ensure_style(widget());
diff --git a/chrome/browser/ui/gtk/status_bubble_gtk.cc b/chrome/browser/ui/gtk/status_bubble_gtk.cc
index 1be0c4f..059329f 100644
--- a/chrome/browser/ui/gtk/status_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/status_bubble_gtk.cc
@@ -278,7 +278,7 @@ void StatusBubbleGtk::InitWidgets() {
}
void StatusBubbleGtk::UserChangedTheme() {
- if (theme_service_->UseGtkTheme()) {
+ if (theme_service_->UsingNativeTheme()) {
gtk_widget_modify_fg(label_.get(), GTK_STATE_NORMAL, NULL);
gtk_widget_modify_bg(container_.get(), GTK_STATE_NORMAL, NULL);
} else {
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
index 26ed8d4..ebc60c8 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
@@ -841,7 +841,7 @@ void TabRendererGtk::PaintIcon(gfx::Canvas* canvas) {
true);
} else {
if (!data_.favicon.isNull()) {
- if (data_.is_default_favicon && theme_service_->UseGtkTheme()) {
+ if (data_.is_default_favicon && theme_service_->UsingNativeTheme()) {
GdkPixbuf* favicon = GtkThemeService::GetDefaultFavicon(true);
canvas->AsCanvasSkia()->DrawGdkPixbuf(
favicon, favicon_bounds_.x(),
diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc
index 363db95..c304ed8 100644
--- a/chrome/browser/ui/webui/options/personal_options_handler.cc
+++ b/chrome/browser/ui/webui/options/personal_options_handler.cc
@@ -330,17 +330,17 @@ void PersonalOptionsHandler::OnLoginFailure(
void PersonalOptionsHandler::ObserveThemeChanged() {
Profile* profile = web_ui_->GetProfile();
#if defined(TOOLKIT_GTK)
- GtkThemeService* provider = GtkThemeService::GetFrom(profile);
- bool is_gtk_theme = provider->UseGtkTheme();
+ GtkThemeService* theme_service = GtkThemeService::GetFrom(profile);
+ bool is_gtk_theme = theme_service->UsingNativeTheme();
FundamentalValue gtk_enabled(!is_gtk_theme);
web_ui_->CallJavascriptFunction(
"options.PersonalOptions.setGtkThemeButtonEnabled", gtk_enabled);
#else
- ThemeService* provider = ThemeServiceFactory::GetForProfile(profile);
+ ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
bool is_gtk_theme = false;
#endif
- bool is_classic_theme = !is_gtk_theme && provider->UsingDefaultTheme();
+ bool is_classic_theme = !is_gtk_theme && theme_service->UsingDefaultTheme();
FundamentalValue enabled(!is_classic_theme);
web_ui_->CallJavascriptFunction(
"options.PersonalOptions.setThemesResetButtonEnabled", enabled);
generated by cgit v1.1 at 2025-01-15 06:33:16 +0000