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, 104 insertions, 111 deletions

diff --git a/chrome/common/gtk_util.h b/chrome/common/gtk_util.h
index 0737016..399cb42 100644
--- a/chrome/common/gtk_util.h
+++ b/chrome/common/gtk_util.h
@@ -9,7 +9,6 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 #include "chrome/common/x11_util.h"
@@ -31,115 +30,109 @@ guint32 GetGdkEventTime(GdkEvent* event);
 
 }  // namespace event_utils
 
-class GtkUtil {
- public:
-  // Constants relating to the layout of dialog windows:
-  // (See http://library.gnome.org/devel/hig-book/stable/design-window.html.en)
-
-  // Spacing between controls of the same group.
-  static const int kControlSpacing = 6;
-
-  // Horizontal spacing between a label and its control.
-  static const int kLabelSpacing = 12;
-
-  // Indent of the controls within each group.
-  static const int kGroupIndent = 12;
-
-  // Space around the outsides of a dialog's contents.
-  static const int kContentAreaBorder = 12;
-
-  // Spacing between groups of controls.
-  static const int kContentAreaSpacing = 18;
-
-  // Create a table of labeled controls, using proper spacing and alignment.
-  // Arguments should be pairs of const char*, GtkWidget*, concluding with a
-  // NULL.  The first argument is a vector in which to place all labels
-  // produced. It can be NULL if you don't need to keep track of the label
-  // widgets. The second argument is a color to force the label text to. It can
-  // be NULL to get the system default.
-  //
-  // For example:
-  // controls = CreateLabeledControlsGroup(NULL, &gfx::kGdkBlack,
-  //                                       "Name:", title_entry_,
-  //                                       "Folder:", folder_combobox_,
-  //                                       NULL);
-  static GtkWidget* CreateLabeledControlsGroup(std::vector<GtkWidget*>* labels,
-                                               const char* text, ...);
-
-  // Create a GtkBin with |child| as its child widget.  This bin will paint a
-  // border of color |color| with the sizes specified in pixels.
-  static GtkWidget* CreateGtkBorderBin(GtkWidget* child, const GdkColor* color,
-                                       int top, int bottom,
-                                       int left, int right);
-
-  // Calculates the size of given widget based on the size specified in
-  // number of characters/lines (in locale specific resource file) and
-  // font metrics.
-  static bool GetWidgetSizeFromResources(GtkWidget* widget,
-                                         int width_chars, int height_lines,
-                                         int* width, int* height);
-
-  // Remove all children from this container.
-  static void RemoveAllChildren(GtkWidget* container);
-
-  // Force the font size of the widget to |size_pixels|.
-  static void ForceFontSizePixels(GtkWidget* widget, double size_pixels);
-
-  // Gets the position of a gtk widget in screen coordinates.
-  static gfx::Point GetWidgetScreenPosition(GtkWidget* widget);
-
-  // Returns the bounds of the specified widget in screen coordinates.
-  static gfx::Rect GetWidgetScreenBounds(GtkWidget* widget);
-
-  // Converts a point in a widget to screen coordinates.  The point |p| is
-  // relative to the widget's top-left origin.
-  static void ConvertWidgetPointToScreen(GtkWidget* widget, gfx::Point* p);
-
-  // Initialize some GTK settings so that our dialogs are consistent.
-  static void InitRCStyles();
-
-  // Stick the widget in the given hbox without expanding vertically. The widget
-  // is packed at the start of the hbox. This is useful for widgets that would
-  // otherwise expand to fill the vertical space of the hbox (e.g. buttons).
-  static void CenterWidgetInHBox(GtkWidget* hbox, GtkWidget* widget,
-                                 bool pack_at_end, int padding);
-
-  // Change windows accelerator style to GTK style. (GTK uses _ for
-  // accelerators.  Windows uses & with && as an escape for &.)
-  static std::string ConvertAcceleratorsFromWindowsStyle(
-      const std::string& label);
-
-  // Returns true if the screen is composited, false otherwise.
-  static bool IsScreenComposited();
-
-  // Enumerates the top-level gdk windows of the current display.
-  static void EnumerateTopLevelWindows(
-      x11_util::EnumerateWindowsDelegate* delegate);
-
-  // Set that a button causes a page navigation. In particular, it will accept
-  // middle clicks. Warning: only call this *after* you have connected your
-  // own handlers for button-press and button-release events, or you will not
-  // get those events.
-  static void SetButtonTriggersNavigation(GtkWidget* button);
-
-  // Returns the mirrored x value for |bounds| if the layout is RTL; otherwise,
-  // the original value is returned unchanged.
-  static int MirroredLeftPointForRect(GtkWidget* widget,
-                                      const gfx::Rect& bounds);
-
-  // Returns the mirrored x value for the point |x| if the layout is RTL;
-  // otherwise, the original value is returned unchanged.
-  static int MirroredXCoordinate(GtkWidget* widget, int x);
-
-  // Returns true if the pointer is currently inside the widget.
-  static bool WidgetContainsCursor(GtkWidget* widget);
-
-  // Sets the icon of |window| to the product icon (potentially used in window
-  // border or alt-tab list).
-  static void SetWindowIcon(GtkWindow* window);
-
- private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(GtkUtil);
-};
+namespace gtk_util {
+
+// Constants relating to the layout of dialog windows:
+// (See http://library.gnome.org/devel/hig-book/stable/design-window.html.en)
+
+// Spacing between controls of the same group.
+const int kControlSpacing = 6;
+
+// Horizontal spacing between a label and its control.
+const int kLabelSpacing = 12;
+
+// Indent of the controls within each group.
+const int kGroupIndent = 12;
+
+// Space around the outsides of a dialog's contents.
+const int kContentAreaBorder = 12;
+
+// Spacing between groups of controls.
+const int kContentAreaSpacing = 18;
+
+// Create a table of labeled controls, using proper spacing and alignment.
+// Arguments should be pairs of const char*, GtkWidget*, concluding with a
+// NULL.  The first argument is a vector in which to place all labels
+// produced. It can be NULL if you don't need to keep track of the label
+// widgets. The second argument is a color to force the label text to. It can
+// be NULL to get the system default.
+//
+// For example:
+// controls = CreateLabeledControlsGroup(NULL, &gfx::kGdkBlack,
+//                                       "Name:", title_entry_,
+//                                       "Folder:", folder_combobox_,
+//                                       NULL);
+GtkWidget* CreateLabeledControlsGroup(
+    std::vector<GtkWidget*>* labels,
+    const char* text, ...);
+
+// Create a GtkBin with |child| as its child widget.  This bin will paint a
+// border of color |color| with the sizes specified in pixels.
+GtkWidget* CreateGtkBorderBin(GtkWidget* child, const GdkColor* color,
+                              int top, int bottom, int left, int right);
+
+// Calculates the size of given widget based on the size specified in
+// number of characters/lines (in locale specific resource file) and
+// font metrics.
+bool GetWidgetSizeFromResources(GtkWidget* widget, int width_chars,
+                                int height_lines, int* width, int* height);
+
+// Remove all children from this container.
+void RemoveAllChildren(GtkWidget* container);
+
+// Force the font size of the widget to |size_pixels|.
+void ForceFontSizePixels(GtkWidget* widget, double size_pixels);
+
+// Gets the position of a gtk widget in screen coordinates.
+gfx::Point GetWidgetScreenPosition(GtkWidget* widget);
+
+// Returns the bounds of the specified widget in screen coordinates.
+gfx::Rect GetWidgetScreenBounds(GtkWidget* widget);
+
+// Converts a point in a widget to screen coordinates.  The point |p| is
+// relative to the widget's top-left origin.
+void ConvertWidgetPointToScreen(GtkWidget* widget, gfx::Point* p);
+
+// Initialize some GTK settings so that our dialogs are consistent.
+void InitRCStyles();
+
+// Stick the widget in the given hbox without expanding vertically. The widget
+// is packed at the start of the hbox. This is useful for widgets that would
+// otherwise expand to fill the vertical space of the hbox (e.g. buttons).
+void CenterWidgetInHBox(GtkWidget* hbox, GtkWidget* widget, bool pack_at_end,
+                        int padding);
+
+// Change windows accelerator style to GTK style. (GTK uses _ for
+// accelerators.  Windows uses & with && as an escape for &.)
+std::string ConvertAcceleratorsFromWindowsStyle(const std::string& label);
+
+// Returns true if the screen is composited, false otherwise.
+bool IsScreenComposited();
+
+// Enumerates the top-level gdk windows of the current display.
+void EnumerateTopLevelWindows(x11_util::EnumerateWindowsDelegate* delegate);
+
+// Set that a button causes a page navigation. In particular, it will accept
+// middle clicks. Warning: only call this *after* you have connected your
+// own handlers for button-press and button-release events, or you will not get
+// those events.
+void SetButtonTriggersNavigation(GtkWidget* button);
+
+// Returns the mirrored x value for |bounds| if the layout is RTL; otherwise,
+// the original value is returned unchanged.
+int MirroredLeftPointForRect(GtkWidget* widget, const gfx::Rect& bounds);
+
+// Returns the mirrored x value for the point |x| if the layout is RTL;
+// otherwise, the original value is returned unchanged.
+int MirroredXCoordinate(GtkWidget* widget, int x);
+
+// Returns true if the pointer is currently inside the widget.
+bool WidgetContainsCursor(GtkWidget* widget);
+
+// Sets the icon of |window| to the product icon (potentially used in window
+// border or alt-tab list).
+void SetWindowIcon(GtkWindow* window);
+
+}  // namespace gtk_util
 
 #endif  // CHROME_COMMON_GTK_UTIL_H_