Linux: expose "Use system title bar and borders" preference in options dialog.

chrome/browser/gtk/options/content_page_gtk.cc

 // Copyright (c) 2009 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/options/content_page_gtk.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/gtk_util.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 31 matching lines @@
   options_builder.AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_THEMES_GROUP_NAME),
       InitThemesGroup(), false);
   page_ = options_builder.get_page_widget();
 
   // Add preferences observers.
   ask_to_save_passwords_.Init(prefs::kPasswordManagerEnabled,
                               profile->GetPrefs(), this);
   ask_to_save_form_autofill_.Init(prefs::kFormAutofillEnabled,
                                   profile->GetPrefs(), this);
+  use_custom_chrome_frame_.Init(prefs::kUseCustomChromeFrame,
+                                profile->GetPrefs(), this);
 
   // Load initial values
   NotifyPrefChanged(NULL);
 }
 
 ContentPageGtk::~ContentPageGtk() {
 }
 
 void ContentPageGtk::NotifyPrefChanged(const std::wstring* pref_name) {
   initializing_ = true;
   if (!pref_name || *pref_name == prefs::kPasswordManagerEnabled) {

[Evan Stade, 2009/09/08 18:09:53]

I don't get the logic of these conditions, can't we just check pref_name once at
the top and be done with it?

it doesn't make sense to keep checking pref_name and besides it should be
(pref_name && ..) not (!pref_name || ...)

     if (ask_to_save_passwords_.GetValue()) {
       gtk_toggle_button_set_active(
           GTK_TOGGLE_BUTTON(passwords_asktosave_radio_), TRUE);
     } else {
       gtk_toggle_button_set_active(
           GTK_TOGGLE_BUTTON(passwords_neversave_radio_), TRUE);
     }
   }
   if (!pref_name || *pref_name == prefs::kFormAutofillEnabled) {
     if (ask_to_save_form_autofill_.GetValue()) {
       gtk_toggle_button_set_active(
           GTK_TOGGLE_BUTTON(form_autofill_asktosave_radio_), TRUE);
     } else {
       gtk_toggle_button_set_active(
           GTK_TOGGLE_BUTTON(form_autofill_neversave_radio_), TRUE);
     }
   }
+  if (!pref_name || *pref_name == prefs::kUseCustomChromeFrame) {
+    gtk_toggle_button_set_active(
+        GTK_TOGGLE_BUTTON(system_title_bar_checkbox_),
+        !use_custom_chrome_frame_.GetValue());
+  }
   initializing_ = false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ContentPageGtk, private:
 
 GtkWidget* ContentPageGtk::InitPasswordSavingGroup() {
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   // Ask to save radio button.
@@ skipping 75 matching lines @@
   GtkWidget* clear_data_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_OPTIONS_CLEAR_DATA_BUTTON).c_str());
   g_signal_connect(G_OBJECT(clear_data_button), "clicked",
                    G_CALLBACK(OnClearBrowsingDataButtonClicked), this);
   gtk_box_pack_start(GTK_BOX(button_hbox), clear_data_button, FALSE, FALSE, 0);
 
   return vbox;
 }
 
 GtkWidget* ContentPageGtk::InitThemesGroup() {
+  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   GtkWidget* hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
 
+  // "Use system title bar and borders" checkbox.
+  system_title_bar_checkbox_ = gtk_check_button_new_with_label(
+      l10n_util::GetStringUTF8(IDS_SHOW_WINDOW_DECORATIONS).c_str());
+  g_signal_connect(G_OBJECT(system_title_bar_checkbox_), "clicked",
+                   G_CALLBACK(OnSystemTitleBarCheckboxClicked), this);
+  gtk_box_pack_start(GTK_BOX(vbox), system_title_bar_checkbox_,
+                     FALSE, FALSE, 0);
+
   // GTK theme button.
   GtkWidget* gtk_theme_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_THEMES_GTK_BUTTON).c_str());
   g_signal_connect(G_OBJECT(gtk_theme_button), "clicked",
                    G_CALLBACK(OnGtkThemeButtonClicked), this);
   gtk_box_pack_start(GTK_BOX(hbox), gtk_theme_button, FALSE, FALSE, 0);
 
   // Reset theme button.
   GtkWidget* themes_reset_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_THEMES_RESET_BUTTON).c_str());
   g_signal_connect(G_OBJECT(themes_reset_button), "clicked",
                    G_CALLBACK(OnResetDefaultThemeButtonClicked), this);
   gtk_box_pack_start(GTK_BOX(hbox), themes_reset_button, FALSE, FALSE, 0);
 
   // Get themes button.
   GtkWidget* themes_gallery_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_BUTTON).c_str());
   g_signal_connect(G_OBJECT(themes_gallery_button), "clicked",
                    G_CALLBACK(OnGetThemesButtonClicked), this);
   gtk_box_pack_start(GTK_BOX(hbox), themes_gallery_button, FALSE, FALSE, 0);
 
-  return hbox;
+  gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+  return vbox;
 }
 
 // static
 void ContentPageGtk::OnImportButtonClicked(GtkButton* widget,
                                            ContentPageGtk* page) {
   ImportDialogGtk::Show(
       GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(widget))),
       page->profile());
 }
 
@@ skipping 25 matching lines @@
 void ContentPageGtk::OnGetThemesButtonClicked(GtkButton* widget,
                                               ContentPageGtk* page) {
   page->UserMetricsRecordAction(L"Options_ThemesGallery",
                                 page->profile()->GetPrefs());
   BrowserList::GetLastActive()->OpenURL(
       GURL(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL)),
       GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
 }
 
 // static
+void ContentPageGtk::OnSystemTitleBarCheckboxClicked(GtkButton* widget,
+                                                     ContentPageGtk* page) {
+  bool use_custom = !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+  page->use_custom_chrome_frame_.SetValue(use_custom);
+}
+
+// static
 void ContentPageGtk::OnPasswordsExceptionsButtonClicked(GtkButton* widget,
                                                         ContentPageGtk* page) {
   ShowPasswordsExceptionsWindow(page->profile());
 }
 
 // static
 void ContentPageGtk::OnPasswordRadioToggled(GtkToggleButton* widget,
                                             ContentPageGtk* page) {
   if (page->initializing_)
     return;
@@ skipping 32 matching lines @@
       GTK_TOGGLE_BUTTON(page->form_autofill_asktosave_radio_));
   if (enabled) {
     page->UserMetricsRecordAction(L"Options_FormAutofill_Enable",
                                   page->profile()->GetPrefs());
   } else {
     page->UserMetricsRecordAction(L"Options_FormAutofill_Disable",
                                   page->profile()->GetPrefs());
   }
   page->ask_to_save_form_autofill_.SetValue(enabled);
 }