Linux: convert classes GtkUtil/GtkTreeUtil back to namespaces gtk_util/gtk_tree_util.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/160417

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22130 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 74 insertions, 74 deletions

diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc
index 96ab10e..4e615e5 100644
--- a/chrome/browser/gtk/options/advanced_contents_gtk.cc
+++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc
@@ -149,7 +149,7 @@ class DownloadSection : public OptionsPageBase {
 
 DownloadSection::DownloadSection(Profile* profile)
     : OptionsPageBase(profile), initializing_(true) {
-  page_ = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  page_ = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   // Download location options.
   download_location_button_ = gtk_file_chooser_button_new(
@@ -174,7 +174,7 @@ DownloadSection::DownloadSection(Profile* profile)
     }
   }
 
-  GtkWidget* download_location_control = GtkUtil::CreateLabeledControlsGroup(
+  GtkWidget* download_location_control = gtk_util::CreateLabeledControlsGroup(
       NULL,
       l10n_util::GetStringUTF8(
           IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE).c_str(),
@@ -313,7 +313,7 @@ class NetworkSection : public OptionsPageBase {
 
 NetworkSection::NetworkSection(Profile* profile)
     : OptionsPageBase(profile) {
-  page_ = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  page_ = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   GtkWidget* proxy_description_label = CreateWrappedLabel(
       IDS_OPTIONS_PROXIES_LABEL);
@@ -472,7 +472,7 @@ class PrivacySection : public OptionsPageBase {
 PrivacySection::PrivacySection(Profile* profile)
     : OptionsPageBase(profile),
       initializing_(true) {
-  page_ = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  page_ = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   GtkWidget* section_description_label = CreateWrappedLabel(
       IDS_OPTIONS_DISABLE_SERVICES);
@@ -533,7 +533,7 @@ PrivacySection::PrivacySection(Profile* profile)
   gtk_misc_set_alignment(GTK_MISC(cookie_description_label), 0, 0);
   gtk_box_pack_start(GTK_BOX(page_), cookie_description_label, FALSE, FALSE, 0);
 
-  GtkWidget* cookie_controls = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  GtkWidget* cookie_controls = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(page_),
                      OptionsLayoutBuilderGtk::IndentWidget(cookie_controls),
                      FALSE, FALSE, 0);
@@ -792,7 +792,7 @@ class SecuritySection : public OptionsPageBase {
 
 SecuritySection::SecuritySection(Profile* profile)
     : OptionsPageBase(profile) {
-  page_ = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  page_ = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   GtkWidget* manage_certificates_label = CreateWrappedLabel(
       IDS_OPTIONS_CERTIFICATES_LABEL);
@@ -850,7 +850,7 @@ class WebContentSection : public OptionsPageBase {
 
 WebContentSection::WebContentSection(Profile* profile)
     : OptionsPageBase(profile) {
-  page_ = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  page_ = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   GtkWidget* fonts_and_languages_label = CreateWrappedLabel(
       IDS_OPTIONS_FONTSETTINGS_INFO);
diff --git a/chrome/browser/gtk/options/advanced_page_gtk.cc b/chrome/browser/gtk/options/advanced_page_gtk.cc
index f1cbd99..517669a 100644
--- a/chrome/browser/gtk/options/advanced_page_gtk.cc
+++ b/chrome/browser/gtk/options/advanced_page_gtk.cc
@@ -20,9 +20,9 @@ AdvancedPageGtk::~AdvancedPageGtk() {
 }
 
 void AdvancedPageGtk::Init() {
-  page_ = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  page_ = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(page_),
-                                 GtkUtil::kContentAreaBorder);
+                                 gtk_util::kContentAreaBorder);
 
   GtkWidget* scroll_window = gtk_scrolled_window_new(NULL, NULL);
   gtk_container_add(GTK_CONTAINER(page_), scroll_window);
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index 5e19dc6..3d8d9f6 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -82,7 +82,7 @@ void ContentPageGtk::NotifyPrefChanged(const std::wstring* pref_name) {
 // ContentPageGtk, private:
 
 GtkWidget* ContentPageGtk::InitPasswordSavingGroup() {
-  GtkWidget* vbox = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   // Ask to save radio button.
   passwords_asktosave_radio_ = gtk_radio_button_new_with_label(NULL,
@@ -103,7 +103,7 @@ GtkWidget* ContentPageGtk::InitPasswordSavingGroup() {
 
   // Add the exceptions button into its own horizontal box so it does not
   // depend on the spacing above.
-  GtkWidget* button_hbox = gtk_hbox_new(FALSE, GtkUtil::kLabelSpacing);
+  GtkWidget* button_hbox = gtk_hbox_new(FALSE, gtk_util::kLabelSpacing);
   gtk_container_add(GTK_CONTAINER(vbox), button_hbox);
   GtkWidget* passwords_exceptions_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_EXCEPTIONS).c_str());
@@ -116,7 +116,7 @@ GtkWidget* ContentPageGtk::InitPasswordSavingGroup() {
 }
 
 GtkWidget* ContentPageGtk::InitFormAutofillGroup() {
-  GtkWidget* vbox = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   // Ask to save radio button.
   form_autofill_asktosave_radio_ = gtk_radio_button_new_with_label(NULL,
@@ -139,7 +139,7 @@ GtkWidget* ContentPageGtk::InitFormAutofillGroup() {
 }
 
 GtkWidget* ContentPageGtk::InitBrowsingDataGroup() {
-  GtkWidget* vbox = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   // Browsing data label.
   GtkWidget* browsing_data_label = gtk_label_new(
@@ -149,7 +149,7 @@ GtkWidget* ContentPageGtk::InitBrowsingDataGroup() {
   gtk_box_pack_start(GTK_BOX(vbox), browsing_data_label, FALSE, FALSE, 0);
 
   // Horizontal two button layout.
-  GtkWidget* button_hbox = gtk_hbox_new(FALSE, GtkUtil::kControlSpacing);
+  GtkWidget* button_hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_add(GTK_CONTAINER(vbox), button_hbox);
 
   // Import button.
@@ -170,7 +170,7 @@ GtkWidget* ContentPageGtk::InitBrowsingDataGroup() {
 }
 
 GtkWidget* ContentPageGtk::InitThemesGroup() {
-  GtkWidget* hbox = gtk_hbox_new(FALSE, GtkUtil::kLabelSpacing);
+  GtkWidget* hbox = gtk_hbox_new(FALSE, gtk_util::kLabelSpacing);
 
   // GTK theme button.
   GtkWidget* gtk_theme_button = gtk_button_new_with_label(
diff --git a/chrome/browser/gtk/options/cookies_view.cc b/chrome/browser/gtk/options/cookies_view.cc
index 19cb8d0..b22850e 100644
--- a/chrome/browser/gtk/options/cookies_view.cc
+++ b/chrome/browser/gtk/options/cookies_view.cc
@@ -84,7 +84,7 @@ void CookiesView::Init() {
 
   remove_button_ = gtk_dialog_add_button(
       GTK_DIALOG(dialog_),
-      GtkUtil::ConvertAcceleratorsFromWindowsStyle(
+      gtk_util::ConvertAcceleratorsFromWindowsStyle(
         l10n_util::GetStringUTF8(IDS_COOKIES_REMOVE_LABEL)).c_str(),
       RESPONSE_REMOVE);
   gtk_button_box_set_child_secondary(
@@ -94,7 +94,7 @@ void CookiesView::Init() {
 
   remove_all_button_ = gtk_dialog_add_button(
       GTK_DIALOG(dialog_),
-      GtkUtil::ConvertAcceleratorsFromWindowsStyle(
+      gtk_util::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(IDS_COOKIES_REMOVE_ALL_LABEL)).c_str(),
       RESPONSE_REMOVE_ALL);
   gtk_button_box_set_child_secondary(
@@ -106,12 +106,12 @@ void CookiesView::Init() {
   gtk_window_set_default_size(GTK_WINDOW(dialog_), kDialogDefaultWidth,
                               kDialogDefaultHeight);
   gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
-                      GtkUtil::kContentAreaSpacing);
+                      gtk_util::kContentAreaSpacing);
   g_signal_connect(dialog_, "response", G_CALLBACK(OnResponse), this);
   g_signal_connect(dialog_, "destroy", G_CALLBACK(OnWindowDestroy), this);
 
   // Filtering controls.
-  GtkWidget* filter_hbox = gtk_hbox_new(FALSE, GtkUtil::kControlSpacing);
+  GtkWidget* filter_hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
   filter_entry_ = gtk_entry_new();
   g_signal_connect(G_OBJECT(filter_entry_), "activate",
                    G_CALLBACK(OnFilterEntryActivated), this);
@@ -120,21 +120,21 @@ void CookiesView::Init() {
   gtk_box_pack_start(GTK_BOX(filter_hbox), filter_entry_,
                      TRUE, TRUE, 0);
   filter_clear_button_ = gtk_button_new_with_mnemonic(
-      GtkUtil::ConvertAcceleratorsFromWindowsStyle(
+      gtk_util::ConvertAcceleratorsFromWindowsStyle(
           l10n_util::GetStringUTF8(IDS_COOKIES_CLEAR_SEARCH_LABEL)).c_str());
   g_signal_connect(G_OBJECT(filter_clear_button_), "clicked",
                    G_CALLBACK(OnFilterClearButtonClicked), this);
   gtk_box_pack_start(GTK_BOX(filter_hbox), filter_clear_button_,
                      FALSE, FALSE, 0);
 
-  GtkWidget* filter_controls = GtkUtil::CreateLabeledControlsGroup(NULL,
+  GtkWidget* filter_controls = gtk_util::CreateLabeledControlsGroup(NULL,
       l10n_util::GetStringUTF8(IDS_COOKIES_SEARCH_LABEL).c_str(), filter_hbox,
       NULL);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_)->vbox), filter_controls,
                      FALSE, FALSE, 0);
 
   // Cookie list.
-  GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_)->vbox), cookie_list_vbox,
                      TRUE, TRUE, 0);
 
@@ -203,7 +203,7 @@ void CookiesView::Init() {
   cookie_details_table_ = gtk_table_new(7, 2, FALSE);
   gtk_container_add(GTK_CONTAINER(details_frame), cookie_details_table_);
   gtk_table_set_col_spacing(GTK_TABLE(cookie_details_table_), 0,
-                            GtkUtil::kLabelSpacing);
+                            gtk_util::kLabelSpacing);
 
   InitCookieDetailRow(0, IDS_COOKIES_COOKIE_NAME_LABEL, &cookie_name_entry_);
   InitCookieDetailRow(1, IDS_COOKIES_COOKIE_CONTENT_LABEL,
@@ -289,7 +289,7 @@ void CookiesView::PopulateCookieDetails() {
     NOTREACHED();
     return;
   }
-  int selected_index = GtkTreeUtil::GetTreeSortChildRowNumForPath(
+  int selected_index = gtk_tree_util::GetTreeSortChildRowNumForPath(
         list_sort_, static_cast<GtkTreePath*>(list->data));
   g_list_foreach(list, (GFunc)gtk_tree_path_free, NULL);
   g_list_free(list);
@@ -341,7 +341,7 @@ void CookiesView::RemoveSelectedCookies() {
   GList* node;
   size_t i;
   for (i = 0, node = list; node != NULL; ++i, node = node->next) {
-    selected_rows[i] = GtkTreeUtil::GetTreeSortChildRowNumForPath(
+    selected_rows[i] = gtk_tree_util::GetTreeSortChildRowNumForPath(
         list_sort_, static_cast<GtkTreePath*>(node->data));
   }
   g_list_foreach(list, (GFunc)gtk_tree_path_free, NULL);
@@ -423,8 +423,8 @@ void CookiesView::OnItemsRemoved(int start, int length) {
 // static
 gint CookiesView::CompareSite(GtkTreeModel* model, GtkTreeIter* a,
                                      GtkTreeIter* b, gpointer window) {
-  int row1 = GtkTreeUtil::GetRowNumForIter(model, a);
-  int row2 = GtkTreeUtil::GetRowNumForIter(model, b);
+  int row1 = gtk_tree_util::GetRowNumForIter(model, a);
+  int row2 = gtk_tree_util::GetRowNumForIter(model, b);
   return reinterpret_cast<CookiesView*>(window)->cookies_table_model_->
       CompareValues(row1, row2, IDS_COOKIES_DOMAIN_COLUMN_HEADER);
 }
@@ -432,8 +432,8 @@ gint CookiesView::CompareSite(GtkTreeModel* model, GtkTreeIter* a,
 // static
 gint CookiesView::CompareCookieName(GtkTreeModel* model, GtkTreeIter* a,
                                            GtkTreeIter* b, gpointer window) {
-  int row1 = GtkTreeUtil::GetRowNumForIter(model, a);
-  int row2 = GtkTreeUtil::GetRowNumForIter(model, b);
+  int row1 = gtk_tree_util::GetRowNumForIter(model, a);
+  int row2 = gtk_tree_util::GetRowNumForIter(model, b);
   return reinterpret_cast<CookiesView*>(window)->cookies_table_model_->
       CompareValues(row1, row2, IDS_COOKIES_NAME_COLUMN_HEADER);
 }
diff --git a/chrome/browser/gtk/options/exceptions_page_gtk.cc b/chrome/browser/gtk/options/exceptions_page_gtk.cc
index ceb310f..638a1a7 100644
--- a/chrome/browser/gtk/options/exceptions_page_gtk.cc
+++ b/chrome/browser/gtk/options/exceptions_page_gtk.cc
@@ -44,7 +44,7 @@ ExceptionsPageGtk::ExceptionsPageGtk(Profile* profile)
   g_signal_connect(G_OBJECT(remove_all_button_), "clicked",
                    G_CALLBACK(OnRemoveAllButtonClicked), this);
 
-  GtkWidget* buttons = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  GtkWidget* buttons = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(buttons), remove_button_, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(buttons), remove_all_button_, FALSE, FALSE, 0);
 
@@ -58,9 +58,9 @@ ExceptionsPageGtk::ExceptionsPageGtk(Profile* profile)
   InitExceptionTree();
   gtk_container_add(GTK_CONTAINER(scroll_window), exception_tree_);
 
-  page_ = gtk_hbox_new(FALSE, GtkUtil::kControlSpacing);
+  page_ = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(page_),
-                                 GtkUtil::kContentAreaBorder);
+                                 gtk_util::kContentAreaBorder);
   gtk_box_pack_end(GTK_BOX(page_), buttons, FALSE, FALSE, 0);
   gtk_box_pack_end(GTK_BOX(page_), scroll_window, TRUE, TRUE, 0);
 }
@@ -133,7 +133,7 @@ void ExceptionsPageGtk::OnRemoveButtonClicked(GtkButton* widget,
 
   GtkTreePath* path = gtk_tree_model_get_path(
       GTK_TREE_MODEL(page->exception_list_sort_), &iter);
-  gint index = GtkTreeUtil::GetTreeSortChildRowNumForPath(
+  gint index = gtk_tree_util::GetTreeSortChildRowNumForPath(
       page->exception_list_sort_, path);
   gtk_tree_path_free(path);
 
@@ -178,8 +178,8 @@ void ExceptionsPageGtk::OnExceptionSelectionChanged(GtkTreeSelection* selection,
 gint ExceptionsPageGtk::CompareSite(GtkTreeModel* model,
                                    GtkTreeIter* a, GtkTreeIter* b,
                                    gpointer window) {
-  int row1 = GtkTreeUtil::GetRowNumForIter(model, a);
-  int row2 = GtkTreeUtil::GetRowNumForIter(model, b);
+  int row1 = gtk_tree_util::GetRowNumForIter(model, a);
+  int row2 = gtk_tree_util::GetRowNumForIter(model, b);
   ExceptionsPageGtk* page = reinterpret_cast<ExceptionsPageGtk*>(window);
   return page->exception_list_[row1].origin.spec().compare(
          page->exception_list_[row2].origin.spec());
diff --git a/chrome/browser/gtk/options/fonts_languages_window_gtk.cc b/chrome/browser/gtk/options/fonts_languages_window_gtk.cc
index 5192b90..9274f12 100644
--- a/chrome/browser/gtk/options/fonts_languages_window_gtk.cc
+++ b/chrome/browser/gtk/options/fonts_languages_window_gtk.cc
@@ -69,7 +69,7 @@ FontsLanguagesWindowGtk::FontsLanguagesWindowGtk(Profile* profile)
       NULL);
   gtk_window_set_default_size(GTK_WINDOW(dialog_), 500, -1);
   gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
-                      GtkUtil::kContentAreaSpacing);
+                      gtk_util::kContentAreaSpacing);
 
   notebook_ = gtk_notebook_new();
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog_)->vbox), notebook_);
diff --git a/chrome/browser/gtk/options/fonts_page_gtk.cc b/chrome/browser/gtk/options/fonts_page_gtk.cc
index a46b6ff..e75369a 100644
--- a/chrome/browser/gtk/options/fonts_page_gtk.cc
+++ b/chrome/browser/gtk/options/fonts_page_gtk.cc
@@ -54,7 +54,7 @@ void FontsPageGtk::Init() {
   g_signal_connect(fixed_font_button_, "font-set", G_CALLBACK(OnFixedFontSet),
                    this);
 
-  GtkWidget* font_controls = GtkUtil::CreateLabeledControlsGroup(NULL,
+  GtkWidget* font_controls = gtk_util::CreateLabeledControlsGroup(NULL,
       l10n_util::GetStringUTF8(
           IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SERIF_LABEL).c_str(),
       serif_font_button_,
@@ -73,7 +73,7 @@ void FontsPageGtk::Init() {
   InitDefaultEncodingComboBox();
   std::string encoding_group_description = l10n_util::GetStringUTF8(
       IDS_FONT_LANGUAGE_SETTING_FONT_DEFAULT_ENCODING_SELECTOR_LABEL);
-  GtkWidget* encoding_controls = GtkUtil::CreateLabeledControlsGroup(NULL,
+  GtkWidget* encoding_controls = gtk_util::CreateLabeledControlsGroup(NULL,
       encoding_group_description.c_str(),
       default_encoding_combobox_,
       NULL);
diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc
index 7036ff1..636d2e0 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, GtkUtil::kControlSpacing);
+  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::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,
-                                               GtkUtil::kControlSpacing);
+                                               gtk_util::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, GtkUtil::kControlSpacing);
+  GtkWidget* url_list_buttons = gtk_vbox_new(FALSE, gtk_util::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(
-      GtkUtil::ConvertAcceleratorsFromWindowsStyle(
+      gtk_util::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(
-      GtkUtil::ConvertAcceleratorsFromWindowsStyle(
+      gtk_util::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(
-      GtkUtil::ConvertAcceleratorsFromWindowsStyle(
+      gtk_util::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, GtkUtil::kControlSpacing);
+  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::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, GtkUtil::kLabelSpacing);
+  GtkWidget* homepage_hbox = gtk_hbox_new(FALSE, gtk_util::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, GtkUtil::kControlSpacing);
+  GtkWidget* hbox = gtk_hbox_new(FALSE, gtk_util::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, GtkUtil::kControlSpacing);
+  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::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.
diff --git a/chrome/browser/gtk/options/options_layout_gtk.cc b/chrome/browser/gtk/options/options_layout_gtk.cc
index b837a84a..a2507fe 100644
--- a/chrome/browser/gtk/options/options_layout_gtk.cc
+++ b/chrome/browser/gtk/options/options_layout_gtk.cc
@@ -14,9 +14,9 @@ const char kGroupTitleMarkup[] =
 }
 
 OptionsLayoutBuilderGtk::OptionsLayoutBuilderGtk() {
-  page_ = gtk_vbox_new(FALSE, GtkUtil::kContentAreaSpacing);
+  page_ = gtk_vbox_new(FALSE, gtk_util::kContentAreaSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(page_),
-                                 GtkUtil::kContentAreaBorder);
+                                 gtk_util::kContentAreaBorder);
 }
 
 void OptionsLayoutBuilderGtk::AddOptionGroup(const std::string& title,
@@ -33,7 +33,7 @@ void OptionsLayoutBuilderGtk::AddOptionGroup(const std::string& title,
 
   GtkWidget* content_alignment = IndentWidget(content);
 
-  GtkWidget* group = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  GtkWidget* group = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(group), title_alignment, FALSE, FALSE, 0);
   gtk_container_add(GTK_CONTAINER(group), content_alignment);
 
@@ -44,7 +44,7 @@ void OptionsLayoutBuilderGtk::AddOptionGroup(const std::string& title,
 GtkWidget* OptionsLayoutBuilderGtk::IndentWidget(GtkWidget* content) {
   GtkWidget* content_alignment = gtk_alignment_new(0.0, 0.5, 1.0, 1.0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(content_alignment), 0, 0,
-                            GtkUtil::kGroupIndent, 0);
+                            gtk_util::kGroupIndent, 0);
   gtk_container_add(GTK_CONTAINER(content_alignment), content);
   return content_alignment;
 }
diff --git a/chrome/browser/gtk/options/options_window_gtk.cc b/chrome/browser/gtk/options/options_window_gtk.cc
index 7aaa065..86e188a 100644
--- a/chrome/browser/gtk/options/options_window_gtk.cc
+++ b/chrome/browser/gtk/options/options_window_gtk.cc
@@ -99,8 +99,8 @@ OptionsWindowGtk::OptionsWindowGtk(Profile* profile)
       NULL);
   gtk_window_set_default_size(GTK_WINDOW(dialog_), 500, -1);
   gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
-                      GtkUtil::kContentAreaSpacing);
-  GtkUtil::SetWindowIcon(GTK_WINDOW(dialog_));
+                      gtk_util::kContentAreaSpacing);
+  gtk_util::SetWindowIcon(GTK_WINDOW(dialog_));
 
   notebook_ = gtk_notebook_new();
 
diff --git a/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc b/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc
index db5ccb8..195a662 100644
--- a/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc
+++ b/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc
@@ -80,8 +80,8 @@ PasswordsExceptionsWindowGtk::PasswordsExceptionsWindowGtk(Profile* profile)
   gtk_window_set_default_size(GTK_WINDOW(dialog_),
                               kPasswordsExceptionsWindowInitialWidth, -1);
   gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
-                      GtkUtil::kContentAreaSpacing);
-  GtkUtil::SetWindowIcon(GTK_WINDOW(dialog_));
+                      gtk_util::kContentAreaSpacing);
+  gtk_util::SetWindowIcon(GTK_WINDOW(dialog_));
 
   notebook_ = gtk_notebook_new();
 
diff --git a/chrome/browser/gtk/options/passwords_page_gtk.cc b/chrome/browser/gtk/options/passwords_page_gtk.cc
index be47c06..9a2f795 100644
--- a/chrome/browser/gtk/options/passwords_page_gtk.cc
+++ b/chrome/browser/gtk/options/passwords_page_gtk.cc
@@ -71,7 +71,7 @@ PasswordsPageGtk::PasswordsPageGtk(Profile* profile)
 
   password_ = gtk_label_new("");
 
-  GtkWidget* buttons = gtk_vbox_new(FALSE, GtkUtil::kControlSpacing);
+  GtkWidget* buttons = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(buttons), remove_button_, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(buttons), remove_all_button_, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(buttons), show_password_button_, FALSE, FALSE, 0);
@@ -87,9 +87,9 @@ PasswordsPageGtk::PasswordsPageGtk(Profile* profile)
   InitPasswordTree();
   gtk_container_add(GTK_CONTAINER(scroll_window), password_tree_);
 
-  page_ = gtk_hbox_new(FALSE, GtkUtil::kControlSpacing);
+  page_ = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(page_),
-                                 GtkUtil::kContentAreaBorder);
+                                 gtk_util::kContentAreaBorder);
   gtk_box_pack_end(GTK_BOX(page_), buttons, FALSE, FALSE, 0);
   gtk_box_pack_end(GTK_BOX(page_), scroll_window, TRUE, TRUE, 0);
 }
@@ -178,7 +178,7 @@ void PasswordsPageGtk::OnRemoveButtonClicked(GtkButton* widget,
 
   GtkTreePath* path = gtk_tree_model_get_path(
       GTK_TREE_MODEL(page->password_list_sort_), &iter);
-  gint index = GtkTreeUtil::GetTreeSortChildRowNumForPath(
+  gint index = gtk_tree_util::GetTreeSortChildRowNumForPath(
       page->password_list_sort_, path);
   gtk_tree_path_free(path);
 
@@ -260,7 +260,7 @@ void PasswordsPageGtk::OnShowPasswordButtonClicked(GtkButton* widget,
   }
   GtkTreePath* path = gtk_tree_model_get_path(
       GTK_TREE_MODEL(page->password_list_sort_), &iter);
-  gint index = GtkTreeUtil::GetTreeSortChildRowNumForPath(
+  gint index = gtk_tree_util::GetTreeSortChildRowNumForPath(
       page->password_list_sort_, path);
   gtk_tree_path_free(path);
   std::string pass = WideToUTF8(page->password_list_[index].password_value);
@@ -292,8 +292,8 @@ void PasswordsPageGtk::OnPasswordSelectionChanged(GtkTreeSelection* selection,
 gint PasswordsPageGtk::CompareSite(GtkTreeModel* model,
                                    GtkTreeIter* a, GtkTreeIter* b,
                                    gpointer window) {
-  int row1 = GtkTreeUtil::GetRowNumForIter(model, a);
-  int row2 = GtkTreeUtil::GetRowNumForIter(model, b);
+  int row1 = gtk_tree_util::GetRowNumForIter(model, a);
+  int row2 = gtk_tree_util::GetRowNumForIter(model, b);
   PasswordsPageGtk* page = reinterpret_cast<PasswordsPageGtk*>(window);
   return page->password_list_[row1].origin.spec().compare(
          page->password_list_[row2].origin.spec());
@@ -303,8 +303,8 @@ gint PasswordsPageGtk::CompareSite(GtkTreeModel* model,
 gint PasswordsPageGtk::CompareUsername(GtkTreeModel* model,
                                        GtkTreeIter* a, GtkTreeIter* b,
                                        gpointer window) {
-  int row1 = GtkTreeUtil::GetRowNumForIter(model, a);
-  int row2 = GtkTreeUtil::GetRowNumForIter(model, b);
+  int row1 = gtk_tree_util::GetRowNumForIter(model, a);
+  int row2 = gtk_tree_util::GetRowNumForIter(model, b);
   PasswordsPageGtk* page = reinterpret_cast<PasswordsPageGtk*>(window);
   return page->password_list_[row1].username_value.compare(
          page->password_list_[row2].username_value);
diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
index 786ce0d..94882b1 100644
--- a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
+++ b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
@@ -60,10 +60,10 @@ UrlPickerDialogGtk::UrlPickerDialogGtk(UrlPickerCallback* callback,
   gtk_window_set_default_size(GTK_WINDOW(dialog_), kDialogDefaultWidth,
                               kDialogDefaultHeight);
   gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
-                      GtkUtil::kContentAreaSpacing);
+                      gtk_util::kContentAreaSpacing);
 
   // URL entry.
-  GtkWidget* url_hbox = gtk_hbox_new(FALSE, GtkUtil::kLabelSpacing);
+  GtkWidget* url_hbox = gtk_hbox_new(FALSE, gtk_util::kLabelSpacing);
   GtkWidget* url_label = gtk_label_new(
       l10n_util::GetStringUTF8(IDS_ASI_URL).c_str());
   gtk_box_pack_start(GTK_BOX(url_hbox), url_label,
@@ -78,7 +78,7 @@ UrlPickerDialogGtk::UrlPickerDialogGtk(UrlPickerCallback* callback,
                      FALSE, FALSE, 0);
 
   // Recent history description label.
-  GtkWidget* history_vbox = gtk_vbox_new(FALSE, GtkUtil::kLabelSpacing);
+  GtkWidget* history_vbox = gtk_vbox_new(FALSE, gtk_util::kLabelSpacing);
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog_)->vbox), history_vbox);
   GtkWidget* history_label = gtk_label_new(NULL);
   char* markup = g_markup_printf_escaped(kHistoryLabelMarkup,
@@ -177,8 +177,8 @@ void UrlPickerDialogGtk::EnableControls() {
 }
 
 std::string UrlPickerDialogGtk::GetURLForPath(GtkTreePath* path) const {
-  gint row = GtkTreeUtil::GetTreeSortChildRowNumForPath(history_list_sort_,
-                                                        path);
+  gint row = gtk_tree_util::GetTreeSortChildRowNumForPath(history_list_sort_,
+                                                          path);
   if (row < 0) {
     NOTREACHED();
     return std::string();
@@ -253,8 +253,8 @@ gint UrlPickerDialogGtk::CompareTitle(GtkTreeModel* model,
                                       GtkTreeIter* a,
                                       GtkTreeIter* b,
                                       gpointer window) {
-  int row1 = GtkTreeUtil::GetRowNumForIter(model, a);
-  int row2 = GtkTreeUtil::GetRowNumForIter(model, b);
+  int row1 = gtk_tree_util::GetRowNumForIter(model, a);
+  int row2 = gtk_tree_util::GetRowNumForIter(model, b);
   return reinterpret_cast<UrlPickerDialogGtk*>(window)->url_table_model_->
       CompareValues(row1, row2, IDS_ASI_PAGE_COLUMN);
 }
@@ -264,8 +264,8 @@ gint UrlPickerDialogGtk::CompareURL(GtkTreeModel* model,
                                     GtkTreeIter* a,
                                     GtkTreeIter* b,
                                     gpointer window) {
-  int row1 = GtkTreeUtil::GetRowNumForIter(model, a);
-  int row2 = GtkTreeUtil::GetRowNumForIter(model, b);
+  int row1 = gtk_tree_util::GetRowNumForIter(model, a);
+  int row2 = gtk_tree_util::GetRowNumForIter(model, b);
   return reinterpret_cast<UrlPickerDialogGtk*>(window)->url_table_model_->
       CompareValues(row1, row2, IDS_ASI_URL_COLUMN);
 }