Add support for XFWM titlebar buttons.

chrome/browser/ui/gtk/browser_titlebar.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/browser_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 13 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/gtk/accelerators_gtk.h"
 #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"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 259 matching lines @@
   gtk_box_pack_end(GTK_BOX(container_hbox_), titlebar_right_buttons_vbox_,
                    FALSE, FALSE, 0);
 
   // Create the Avatar button and listen for notifications. It must always be
   // created because a new profile can be added at any time.
   avatar_button_.reset(new AvatarMenuButtonGtk(browser_window_->browser()));
 
   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();
 
   // We use an alignment to control the titlebar height.
   titlebar_alignment_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   if (browser_window_->browser()->is_type_tabbed()) {
     gtk_box_pack_start(GTK_BOX(container_hbox_), titlebar_alignment_, TRUE,
                        TRUE, 0);
 
     // Put the tab strip in the titlebar.
@@ skipping 42 matching lines @@
                  content::Source<ThemeService>(theme_service_));
   theme_service_->InitThemesFor(this);
 
   gtk_widget_show_all(container_);
 
   ui::ActiveWindowWatcherX::AddObserver(this);
 }
 
 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) {
   // Clear out all previous data.
   close_button_.reset();
   restore_button_.reset();
   maximize_button_.reset();
   minimize_button_.reset();
   gtk_util::RemoveAllChildren(titlebar_left_buttons_vbox_);
   gtk_util::RemoveAllChildren(titlebar_right_buttons_vbox_);
@@ skipping 632 matching lines @@
     ui::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator(ui::NORMAL_SEPARATOR);
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator(ui::NORMAL_SEPARATOR);
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }