diff options
| author | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 00:54:23 +0000 |
|---|---|---|
| committer | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-23 00:54:23 +0000 |
| commit | 95473bab10a84e0d3efe1369c837dfcf67f207fc (patch) | |
| tree | f04cea4df9d01628883ae99c83ccd62ec6c55bb6 | |
| parent | 62351a9468203f071d8bc9afabde1681b4d9b899 (diff) | |
| download | chromium_src-95473bab10a84e0d3efe1369c837dfcf67f207fc.zip chromium_src-95473bab10a84e0d3efe1369c837dfcf67f207fc.tar.gz chromium_src-95473bab10a84e0d3efe1369c837dfcf67f207fc.tar.bz2 | |
Apply diff from jhawkins@
Bug=42357
Test= Go to wrench > options, Chrome Linux doesn't crash
Review URL: http://codereview.chromium.org/1689009
git-svn-id: svn://svn.chromium.org/chrome/branches/375/src@45392 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/gtk/options/content_page_gtk.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc index b8b6de1..3824c12 100644 --- a/chrome/browser/gtk/options/content_page_gtk.cc +++ b/chrome/browser/gtk/options/content_page_gtk.cc @@ -156,7 +156,8 @@ void ContentPageGtk::OnStateChanged() { // state of the widget for the given preference name, as it has changed. void ContentPageGtk::NotifyPrefChanged(const std::wstring* pref_name) { initializing_ = true; - if (!pref_name || *pref_name == prefs::kPasswordManagerEnabled) { + if (!pref_name || *pref_name == prefs::kPasswordManagerEnabled && + autofill_button_ != NULL) { if (ask_to_save_passwords_.GetValue()) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(passwords_asktosave_radio_), TRUE); @@ -280,6 +281,7 @@ GtkWidget* ContentPageGtk::InitFormAutoFillGroup() { gtk_container_add(GTK_CONTAINER(vbox), button_hbox); // AutoFill button. + autofill_button_ = NULL; if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAutoFill)) { autofill_button_ = gtk_button_new_with_label( l10n_util::GetStringUTF8(IDS_OPTIONS_AUTOFILL_SETTINGS).c_str()); |