Index: chrome/browser/ui/libgtk2ui/gtk2_border.cc |
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.cc b/chrome/browser/ui/libgtk2ui/gtk2_border.cc |
index eefa5a49c7c227fedb6d6d56e240f56724b7f253..67abbd89baa288cd9f013a48ef92aeb9b5d348da 100644 |
--- a/chrome/browser/ui/libgtk2ui/gtk2_border.cc |
+++ b/chrome/browser/ui/libgtk2ui/gtk2_border.cc |
@@ -76,16 +76,16 @@ Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui, |
: gtk2_ui_(gtk2_ui), |
owning_button_(owning_button), |
border_(border.Pass()) { |
- gtk2_ui_->AddNativeThemeChangeObserver(this); |
+ gtk2_ui_->AddSystemThemeChangeObserver(this); |
} |
Gtk2Border::~Gtk2Border() { |
- gtk2_ui_->RemoveNativeThemeChangeObserver(this); |
+ gtk2_ui_->RemoveSystemThemeChangeObserver(this); |
} |
void Gtk2Border::Paint(const views::View& view, gfx::Canvas* canvas) { |
ui::ThemeProvider* provider = owning_button_->GetThemeProvider(); |
- if (!provider || !provider->UsingNativeTheme()) { |
+ if (!provider || !provider->UsingSystemTheme()) { |
border_->Paint(view, canvas); |
return; |
} |
@@ -127,7 +127,7 @@ gfx::Insets Gtk2Border::GetInsets() const { |
// the buttons which are just toolbar images. |
ui::ThemeProvider* provider = owning_button_->GetThemeProvider(); |
if (owning_button_->style() == views::Button::STYLE_BUTTON || |
- (!provider || !provider->UsingNativeTheme())) |
+ (!provider || !provider->UsingSystemTheme())) |
return border_->GetInsets(); |
// On STYLE_TEXTUBTTON, we want the smaller insets so we can fit the GTK icon |
@@ -137,14 +137,14 @@ gfx::Insets Gtk2Border::GetInsets() const { |
gfx::Size Gtk2Border::GetMinimumSize() const { |
ui::ThemeProvider* provider = owning_button_->GetThemeProvider(); |
- if (!provider || !provider->UsingNativeTheme()) |
+ if (!provider || !provider->UsingSystemTheme()) |
return border_->GetMinimumSize(); |
gfx::Insets insets = GetInsets(); |
return gfx::Size(insets.width(), insets.height()); |
} |
-void Gtk2Border::OnNativeThemeChanged() { |
+void Gtk2Border::OnSystemThemeChanged() { |
for (int i = 0; i < kNumberOfFocusedStates; ++i) { |
for (int j = 0; j < views::Button::STATE_COUNT; ++j) { |
button_images_[i][j] = gfx::ImageSkia(); |