Add support for XFWM titlebar buttons.

chrome/browser/ui/gtk/browser_titlebar.cc

Index: chrome/browser/ui/gtk/browser_titlebar.cc
===================================================================
--- chrome/browser/ui/gtk/browser_titlebar.cc	(revision 164859)
+++ chrome/browser/ui/gtk/browser_titlebar.cc	(working copy)
@@ -31,14 +31,12 @@
 #include "chrome/browser/ui/gtk/avatar_menu_button_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
-#if defined(USE_GCONF)
-#include "chrome/browser/ui/gtk/gconf_titlebar_listener.h"
-#endif
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/gtk/nine_box.h"
 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
+#include "chrome/browser/ui/gtk/titlebar_listener.h"
 #include "chrome/browser/ui/gtk/unity_service.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
@@ -318,13 +316,7 @@
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
                  content::NotificationService::AllSources());
 
-#if defined(USE_GCONF)
-  // Either read the gconf database and register for updates (on GNOME), or use
-  // the default value (anywhere else).
-  GConfTitlebarListener::GetInstance()->SetTitlebarButtons(this);
-#else
-  BuildButtons(kDefaultButtonString);
-#endif
+  TitlebarListener::GetInstance()->SetTitlebarButtons(this);
 
   UpdateAvatar();
 
@@ -387,9 +379,7 @@
 
 BrowserTitlebar::~BrowserTitlebar() {
   ui::ActiveWindowWatcherX::RemoveObserver(this);
-#if defined(USE_GCONF)
-  GConfTitlebarListener::GetInstance()->RemoveObserver(this);
-#endif
+  TitlebarListener::GetInstance()->RemoveObserver(this);
 }
 
 void BrowserTitlebar::BuildButtons(const std::string& button_string) {