summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/options/general_page_gtk.cc
diff options
context:
space:
mode:
authormdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 01:33:24 +0000
committermdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 01:33:24 +0000
commit63302a8b9faec92f1b956737057205acc2b44907 (patch)
tree4ced0044147ef7e0d2e525c37b7922dfca195e9f /chrome/browser/gtk/options/general_page_gtk.cc
parent21a00fd62cb2760b12912697e9af1fb95aaf613c (diff)
downloadchromium_src-63302a8b9faec92f1b956737057205acc2b44907.zip
chromium_src-63302a8b9faec92f1b956737057205acc2b44907.tar.gz
chromium_src-63302a8b9faec92f1b956737057205acc2b44907.tar.bz2
Linux: convert namespace gtk_util to class GtkUtil to meet style guidelines.
BUG=none TEST=none Review URL: http://codereview.chromium.org/160371 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options/general_page_gtk.cc')
-rw-r--r--chrome/browser/gtk/options/general_page_gtk.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc
index 636d2e0..7036ff1 100644
--- a/chrome/browser/gtk/options/general_page_gtk.cc
+++ b/chrome/browser/gtk/options/general_page_gtk.cc
@@ -171,7 +171,7 @@ void GeneralPageGtk::HighlightGroup(OptionsGroup highlight_group) {
// GeneralPageGtk, private:
GtkWidget* GeneralPageGtk::InitStartupGroup() {
- GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
+ GtkWidget* vbox = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
startup_homepage_radio_ = gtk_radio_button_new_with_label(NULL,
l10n_util::GetStringUTF8(
@@ -196,7 +196,7 @@ GtkWidget* GeneralPageGtk::InitStartupGroup() {
gtk_box_pack_start(GTK_BOX(vbox), startup_custom_radio_, FALSE, FALSE, 0);
GtkWidget* url_list_container = gtk_hbox_new(FALSE,
- gtk_util::kControlSpacing);
+ GtkUtil::kControlSpacing);
gtk_box_pack_start(GTK_BOX(vbox), url_list_container, TRUE, TRUE, 0);
GtkWidget* scroll_window = gtk_scrolled_window_new(NULL, NULL);
@@ -238,26 +238,26 @@ GtkWidget* GeneralPageGtk::InitStartupGroup() {
profile(),
&fav_icon_consumer_));
- GtkWidget* url_list_buttons = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
+ GtkWidget* url_list_buttons = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
gtk_box_pack_end(GTK_BOX(url_list_container), url_list_buttons,
FALSE, FALSE, 0);
startup_add_custom_page_button_ = gtk_button_new_with_mnemonic(
- gtk_util::ConvertAcceleratorsFromWindowsStyle(
+ GtkUtil::ConvertAcceleratorsFromWindowsStyle(
l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_ADD_BUTTON)).c_str());
g_signal_connect(G_OBJECT(startup_add_custom_page_button_), "clicked",
G_CALLBACK(OnStartupAddCustomPageClicked), this);
gtk_box_pack_start(GTK_BOX(url_list_buttons), startup_add_custom_page_button_,
FALSE, FALSE, 0);
startup_remove_custom_page_button_ = gtk_button_new_with_mnemonic(
- gtk_util::ConvertAcceleratorsFromWindowsStyle(
+ GtkUtil::ConvertAcceleratorsFromWindowsStyle(
l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_REMOVE_BUTTON)).c_str());
g_signal_connect(G_OBJECT(startup_remove_custom_page_button_), "clicked",
G_CALLBACK(OnStartupRemoveCustomPageClicked), this);
gtk_box_pack_start(GTK_BOX(url_list_buttons),
startup_remove_custom_page_button_, FALSE, FALSE, 0);
startup_use_current_page_button_ = gtk_button_new_with_mnemonic(
- gtk_util::ConvertAcceleratorsFromWindowsStyle(
+ GtkUtil::ConvertAcceleratorsFromWindowsStyle(
l10n_util::GetStringUTF8(IDS_OPTIONS_STARTUP_USE_CURRENT)).c_str());
g_signal_connect(G_OBJECT(startup_use_current_page_button_), "clicked",
G_CALLBACK(OnStartupUseCurrentPageClicked), this);
@@ -268,7 +268,7 @@ GtkWidget* GeneralPageGtk::InitStartupGroup() {
}
GtkWidget* GeneralPageGtk::InitHomepageGroup() {
- GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
+ GtkWidget* vbox = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
homepage_use_newtab_radio_ = gtk_radio_button_new_with_label(NULL,
l10n_util::GetStringUTF8(IDS_OPTIONS_HOMEPAGE_USE_NEWTAB).c_str());
@@ -276,7 +276,7 @@ GtkWidget* GeneralPageGtk::InitHomepageGroup() {
G_CALLBACK(OnNewTabIsHomePageToggled), this);
gtk_container_add(GTK_CONTAINER(vbox), homepage_use_newtab_radio_);
- GtkWidget* homepage_hbox = gtk_hbox_new(FALSE, gtk_util::kLabelSpacing);
+ GtkWidget* homepage_hbox = gtk_hbox_new(FALSE, GtkUtil::kLabelSpacing);
gtk_container_add(GTK_CONTAINER(vbox), homepage_hbox);
homepage_use_url_radio_ = gtk_radio_button_new_with_label_from_widget(
@@ -302,7 +302,7 @@ GtkWidget* GeneralPageGtk::InitHomepageGroup() {
}
GtkWidget* GeneralPageGtk::InitDefaultSearchGroup() {
- GtkWidget* hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
+ GtkWidget* hbox = gtk_hbox_new(FALSE, GtkUtil::kControlSpacing);
default_search_engines_model_ = gtk_list_store_new(SEARCH_ENGINES_COL_COUNT,
G_TYPE_UINT,
@@ -340,7 +340,7 @@ GtkWidget* GeneralPageGtk::InitDefaultSearchGroup() {
}
GtkWidget* GeneralPageGtk::InitDefaultBrowserGroup() {
- GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
+ GtkWidget* vbox = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
// TODO(mattm): the label should be created with a text like "checking for
// default" to be displayed while we wait for the check to complete.