OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/gtk/options/advanced_contents_gtk.h" | 5 #include "chrome/browser/ui/gtk/options/advanced_contents_gtk.h" |
6 | 6 |
7 #include <sys/types.h> | 7 #include <sys/types.h> |
8 #include <sys/wait.h> | 8 #include <sys/wait.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 1120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1131 g_signal_connect(fonts_and_languages_button, "clicked", | 1131 g_signal_connect(fonts_and_languages_button, "clicked", |
1132 G_CALLBACK(OnFontsAndLanguagesButtonClicked), this); | 1132 G_CALLBACK(OnFontsAndLanguagesButtonClicked), this); |
1133 // Stick it in an hbox so it doesn't expand to the whole width. | 1133 // Stick it in an hbox so it doesn't expand to the whole width. |
1134 GtkWidget* button_hbox = gtk_hbox_new(FALSE, 0); | 1134 GtkWidget* button_hbox = gtk_hbox_new(FALSE, 0); |
1135 gtk_box_pack_start(GTK_BOX(button_hbox), | 1135 gtk_box_pack_start(GTK_BOX(button_hbox), |
1136 fonts_and_languages_button, | 1136 fonts_and_languages_button, |
1137 FALSE, FALSE, 0); | 1137 FALSE, FALSE, 0); |
1138 gtk_box_pack_start(GTK_BOX(page_), | 1138 gtk_box_pack_start(GTK_BOX(page_), |
1139 gtk_util::IndentWidget(button_hbox), | 1139 gtk_util::IndentWidget(button_hbox), |
1140 FALSE, FALSE, 0); | 1140 FALSE, FALSE, 0); |
1141 | |
1142 // TODO(mattm): gears options would go here if we supported gears | |
1143 } | 1141 } |
1144 | 1142 |
1145 // static | 1143 // static |
1146 void WebContentSection::OnFontsAndLanguagesButtonClicked( | 1144 void WebContentSection::OnFontsAndLanguagesButtonClicked( |
1147 GtkButton *button, WebContentSection* section) { | 1145 GtkButton *button, WebContentSection* section) { |
1148 ShowFontsLanguagesWindow(GTK_WINDOW(gtk_widget_get_toplevel(section->page_)), | 1146 ShowFontsLanguagesWindow(GTK_WINDOW(gtk_widget_get_toplevel(section->page_)), |
1149 FONTS_ENCODING_PAGE, | 1147 FONTS_ENCODING_PAGE, |
1150 section->profile()); | 1148 section->profile()); |
1151 } | 1149 } |
1152 | 1150 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1190 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT), | 1188 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT), |
1191 web_content_section_->get_page_widget(), false); | 1189 web_content_section_->get_page_widget(), false); |
1192 | 1190 |
1193 security_section_.reset(new SecuritySection(profile_)); | 1191 security_section_.reset(new SecuritySection(profile_)); |
1194 options_builder->AddOptionGroup( | 1192 options_builder->AddOptionGroup( |
1195 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY), | 1193 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY), |
1196 security_section_->get_page_widget(), false); | 1194 security_section_->get_page_widget(), false); |
1197 | 1195 |
1198 page_ = options_builder->get_page_widget(); | 1196 page_ = options_builder->get_page_widget(); |
1199 } | 1197 } |
OLD | NEW |