linux: Move linux_util.h from gfx/ to ui/base/gtk.

The reason for this, is that I don't think this belongs to gfx/ directory. Also rename it to
menu_label_accelerator_util.* to make it clear what the conversion functions are about.

TEST=ui_unittests --gtest_filter=MenuLabelAcceleratorUtilTest*
R=tony@chromium.org
TBR=erg@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10316013

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

5 files changed, 17 insertions, 19 deletions

diff --git a/ui/gfx/linux_util.cc b/ui/base/gtk/menu_label_accelerator_util.cc
index 8484e1b..f8192c5 100644
--- a/ui/gfx/linux_util.cc
+++ b/ui/base/gtk/menu_label_accelerator_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/linux_util.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 
 #include "base/string_util.h"
 
@@ -39,7 +39,7 @@ std::string ConvertAmpersandsTo(const std::string& label,
 
 }  // namespace
 
-namespace gfx {
+namespace ui {
 
 std::string ConvertAcceleratorsFromWindowsStyle(const std::string& label) {
   return ConvertAmpersandsTo(label, "_");
@@ -59,4 +59,4 @@ std::string EscapeWindowsStyleAccelerators(const std::string& label) {
   return ret;
 }
 
-}  // namespace gfx
+}  // namespace ui
diff --git a/ui/gfx/linux_util.h b/ui/base/gtk/menu_label_accelerator_util.h
index a2136af..276a859 100644
--- a/ui/gfx/linux_util.h
+++ b/ui/base/gtk/menu_label_accelerator_util.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_LINUX_UTIL_H_
-#define UI_GFX_LINUX_UTIL_H_
+#ifndef UI_BASE_GTK_MENU_LABEL_ACCELERATOR_UTIL_H_
+#define UI_BASE_GTK_MENU_LABEL_ACCELERATOR_UTIL_H_
 #pragma once
 
 #include <string>
 
 #include "ui/base/ui_export.h"
 
-namespace gfx {
+namespace ui {
 
 // Change windows accelerator style to GTK style. (GTK uses _ for
 // accelerators.  Windows uses & with && as an escape for &.)
@@ -25,6 +25,6 @@ UI_EXPORT std::string RemoveWindowsStyleAccelerators(const std::string& label);
 // with "_" characters doubled, to escape them for GTK).
 UI_EXPORT std::string EscapeWindowsStyleAccelerators(const std::string& label);
 
-}  // namespace gfx
+}  // namespace ui
 
-#endif  // UI_GFX_LINUX_UTIL_H_
+#endif  // UI_BASE_GTK_MENU_LABEL_ACCELERATOR_UTIL_H_
diff --git a/ui/gfx/linux_util_unittest.cc b/ui/base/gtk/menu_label_accelerator_util_unittest.cc
index 781c2c0..20e978e 100644
--- a/ui/gfx/linux_util_unittest.cc
+++ b/ui/base/gtk/menu_label_accelerator_util_unittest.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/gfx/linux_util.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace gfx {
+namespace ui {
 
-TEST(LinuxUtilTest, ConvertAcceleratorsFromWindowsStyle) {
+TEST(MenuLabelAcceleratorTest, ConvertAcceleratorsFromWindowsStyle) {
   static const struct {
     const char* input;
     const char* output;
@@ -28,7 +28,7 @@ TEST(LinuxUtilTest, ConvertAcceleratorsFromWindowsStyle) {
   }
 }
 
-TEST(LinuxUtilTest, RemoveWindowsStyleAccelerators) {
+TEST(MenuLabelAcceleratorTest, RemoveWindowsStyleAccelerators) {
   static const struct {
     const char* input;
     const char* output;
@@ -47,7 +47,7 @@ TEST(LinuxUtilTest, RemoveWindowsStyleAccelerators) {
   }
 }
 
-TEST(LinuxUtilTest, EscapeWindowsStyleAccelerators) {
+TEST(MenuLabelAcceleratorTest, EscapeWindowsStyleAccelerators) {
   static const struct {
     const char* input;
     const char* output;
@@ -72,4 +72,4 @@ TEST(LinuxUtilTest, EscapeWindowsStyleAccelerators) {
   }
 }
 
-}  // namespace gfx
+}  // namespace ui
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 55a5838..6541bf4 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -163,6 +163,8 @@
         'base/gtk/gtk_signal_registrar.h',
         'base/gtk/gtk_windowing.cc',
         'base/gtk/gtk_windowing.h',
+        'base/gtk/menu_label_accelerator_util.cc',
+        'base/gtk/menu_label_accelerator_util.h',
         'base/gtk/owned_widget_gtk.cc',
         'base/gtk/owned_widget_gtk.h',
         'base/gtk/scoped_gobject.h',
@@ -487,10 +489,6 @@
             '../build/linux/system.gyp:xext',
             '../build/linux/system.gyp:xfixes',
           ],
-          'sources': [
-            'gfx/linux_util.cc',
-            'gfx/linux_util.h',
-          ],
           'link_settings': {
             'libraries': [
               '-lXrender',  # For XRender* function calls in x11_util.cc.
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 4195b05..77965dc 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -61,6 +61,7 @@
         'base/cocoa/focus_tracker_unittest.mm',
         'base/gtk/gtk_expanded_container_unittest.cc',
         'base/gtk/gtk_im_context_util_unittest.cc',
+        'base/gtk/menu_label_accelerator_util_unittest.cc',
         'base/l10n/l10n_util_mac_unittest.mm',
         'base/l10n/l10n_util_unittest.cc',
         'base/models/list_model_unittest.cc',
@@ -140,7 +141,6 @@
         ['OS == "linux"', {
           'sources': [
             'gfx/platform_font_pango_unittest.cc',
-            'gfx/linux_util_unittest.cc',
           ],
         }],
         ['OS == "linux" and toolkit_views==1', {