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

1 files changed, 9 insertions, 7 deletions

diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc
index 1548e44..f0a85d8 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -13,6 +13,8 @@
 #include "chrome/common/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
+using gtk_util::ConvertAcceleratorsFromWindowsStyle;
+
 MenuGtk::MenuGtk(MenuGtk::Delegate* delegate,
                  const MenuCreateMaterial* menu_data,
                  GtkAccelGroup* accel_group)
@@ -45,9 +47,9 @@ void MenuGtk::ConnectSignalHandlers() {
 
 void MenuGtk::AppendMenuItemWithLabel(int command_id,
                                       const std::string& label) {
-  std::string converted = GtkUtil::ConvertAcceleratorsFromWindowsStyle(label);
+  std::string converted_label = ConvertAcceleratorsFromWindowsStyle(label);
   GtkWidget* menu_item =
-      gtk_menu_item_new_with_mnemonic(converted.c_str());
+      gtk_menu_item_new_with_mnemonic(converted_label.c_str());
   AppendMenuItem(command_id, menu_item);
 }
 
@@ -60,9 +62,9 @@ void MenuGtk::AppendMenuItemWithIcon(int command_id,
 
 void MenuGtk::AppendCheckMenuItemWithLabel(int command_id,
                                            const std::string& label) {
-  std::string converted = GtkUtil::ConvertAcceleratorsFromWindowsStyle(label);
+  std::string converted_label = ConvertAcceleratorsFromWindowsStyle(label);
   GtkWidget* menu_item =
-      gtk_check_menu_item_new_with_mnemonic(converted.c_str());
+      gtk_check_menu_item_new_with_mnemonic(converted_label.c_str());
   AppendMenuItem(command_id, menu_item);
 }
 
@@ -133,7 +135,7 @@ void MenuGtk::BuildMenuIn(GtkWidget* menu,
       DCHECK(!label.empty());
     }
 
-    label = GtkUtil::ConvertAcceleratorsFromWindowsStyle(label);
+    label = ConvertAcceleratorsFromWindowsStyle(label);
 
     switch (menu_data->type) {
       case MENU_RADIO:
@@ -193,9 +195,9 @@ void MenuGtk::BuildMenuIn(GtkWidget* menu,
 
 GtkWidget* MenuGtk::BuildMenuItemWithImage(const std::string& label,
                                            const SkBitmap& icon) {
-  std::string converted = GtkUtil::ConvertAcceleratorsFromWindowsStyle(label);
+  std::string converted_label = ConvertAcceleratorsFromWindowsStyle(label);
   GtkWidget* menu_item =
-      gtk_image_menu_item_new_with_mnemonic(converted.c_str());
+      gtk_image_menu_item_new_with_mnemonic(converted_label.c_str());
 
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
   gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),