Update Windows UI on system color changes.

chrome/browser/ui/libgtk2ui/gtk2_border.h

Index: chrome/browser/ui/libgtk2ui/gtk2_border.h
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.h b/chrome/browser/ui/libgtk2ui/gtk2_border.h
index c201f466357d329ea06b529d616ffc49d7788667..0f7fb215d98e48618a20baa1c4fb113e5f46871a 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_border.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_border.h
@@ -5,11 +5,11 @@
 #ifndef CHROME_BROWSER_UI_LIBGTK2UI_GTK2_BORDER_H_
 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_BORDER_H_
 
+#include "base/scoped_observer.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
-#include "ui/views/linux_ui/native_theme_change_observer.h"
 
 namespace gfx {
 class Canvas;
@@ -24,8 +24,7 @@ namespace libgtk2ui {
 class Gtk2UI;
 
 // Draws a gtk button border, and manages the memory of the resulting pixbufs.
-class Gtk2Border : public views::Border,
-                   public views::NativeThemeChangeObserver {
+class Gtk2Border : public views::Border, public ui::NativeThemeObserver {
  public:
   Gtk2Border(Gtk2UI* gtk2_ui,
              views::LabelButton* owning_button,
@@ -38,7 +37,7 @@ class Gtk2Border : public views::Border,
   virtual gfx::Size GetMinimumSize() const OVERRIDE;
 
   // Overridden from views::NativeThemeChangeObserver:
-  virtual void OnNativeThemeChanged() OVERRIDE;
+  virtual void OnNativeThemeUpdate(ui::NativeTheme* observed_theme) OVERRIDE;
 
  private:
   void PaintState(const ui::NativeTheme::State state,
@@ -61,6 +60,8 @@ class Gtk2Border : public views::Border,
   // delegate to it whenever we aren't in GTK theme mode.
   scoped_ptr<views::Border> border_;
 
+  ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(Gtk2Border);
 };