Make GConf dependency optional.

chrome/browser/gtk/browser_titlebar.cc

 // Copyright (c) 2010 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/gtk/browser_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_tokenizer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/encoding_menu_controller.h"
 #include "chrome/browser/gtk/accelerators_gtk.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/custom_button.h"
+#if defined(USE_GCONF)
 #include "chrome/browser/gtk/gconf_titlebar_listener.h"
+#endif
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/wrench_menu_model.h"
 #include "chrome/common/notification_service.h"
@@ skipping 149 matching lines @@
   AddSubMenuWithStringId(IDC_ENCODING_MENU, IDS_ENCODING_MENU,
                          encoding_menu_model_.get());
 
   AddSeparator();
   AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTitlebar
 
+// static
+const char BrowserTitlebar::kDefaultButtonString[] = ":minimize,maximize,close";
+
 BrowserTitlebar::BrowserTitlebar(BrowserWindowGtk* browser_window,
                                  GtkWindow* window)
     : browser_window_(browser_window),
       window_(window),
       titlebar_left_buttons_vbox_(NULL),
       titlebar_right_buttons_vbox_(NULL),
       titlebar_left_buttons_hbox_(NULL),
       titlebar_right_buttons_hbox_(NULL),
       titlebar_left_spy_frame_(NULL),
       titlebar_right_spy_frame_(NULL),
@@ skipping 86 matching lines @@
     gtk_widget_set_no_show_all(titlebar_right_spy_frame_, TRUE);
     gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_right_spy_frame_), 0,
         kOTRBottomSpacing, kOTRSideSpacing, kOTRSideSpacing);
     gtk_box_pack_end(GTK_BOX(container_hbox_), titlebar_right_spy_frame_,
                      FALSE, FALSE, 0);
   }
   titlebar_right_buttons_vbox_ = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_end(GTK_BOX(container_hbox_), titlebar_right_buttons_vbox_,
                    FALSE, FALSE, 0);
 
+#if defined(USE_GCONF)
   // Either read the gconf database and register for updates (on GNOME), or use
   // the default value (anywhere else).
   Singleton<GConfTitlebarListener>()->SetTitlebarButtons(this);
+#else
+  BuildButtons(kDefaultButtonString);
+#endif
 
   // 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()->type() == Browser::TYPE_NORMAL) {
     gtk_box_pack_start(GTK_BOX(container_hbox_), titlebar_alignment_, TRUE,
                        TRUE, 0);
 
     // Put the tab strip in the titlebar.
     gtk_container_add(GTK_CONTAINER(titlebar_alignment_),
                       browser_window_->tabstrip()->widget());
@@ skipping 41 matching lines @@
     UpdateTitleAndIcon();
   }
 
   gtk_widget_show_all(container_);
 
   ActiveWindowWatcherX::AddObserver(this);
 }
 
 BrowserTitlebar::~BrowserTitlebar() {
   ActiveWindowWatcherX::RemoveObserver(this);
+#if defined(USE_GCONF)
   Singleton<GConfTitlebarListener>()->RemoveObserver(this);
+#endif
 }
 
 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 549 matching lines @@
     menus::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator();
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator();
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }