Revert 66784 - Converts usage of SetProp/GetProp to a map. Even after making ...

views/widget/widget_gtk.cc

Index: views/widget/widget_gtk.cc
===================================================================
--- views/widget/widget_gtk.cc	(revision 66785)
+++ views/widget/widget_gtk.cc	(working copy)
@@ -32,6 +32,7 @@
 
 // g_object data keys to associate a WidgetGtk object to a GtkWidget.
 const char* kWidgetKey = "__VIEWS_WIDGET__";
+const wchar_t* kWidgetWideKey = L"__VIEWS_WIDGET__";
 // A g_object data key to associate a CompositePainter object to a GtkWidget.
 const char* kCompositePainterKey = "__VIEWS_COMPOSITE_PAINTER__";
 // A g_object data key to associate the flag whether or not the widget
@@ -802,12 +803,13 @@
   return GetWindowImpl(widget_);
 }
 
-void WidgetGtk::SetNativeWindowProperty(const char* name, void* value) {
-  g_object_set_data(G_OBJECT(widget_), name, value);
+void WidgetGtk::SetNativeWindowProperty(const std::wstring& name,
+                                        void* value) {
+  g_object_set_data(G_OBJECT(widget_), WideToUTF8(name).c_str(), value);
 }
 
-void* WidgetGtk::GetNativeWindowProperty(const char* name) {
-  return g_object_get_data(G_OBJECT(widget_), name);
+void* WidgetGtk::GetNativeWindowProperty(const std::wstring& name) {
+  return g_object_get_data(G_OBJECT(widget_), WideToUTF8(name).c_str());
 }
 
 ThemeProvider* WidgetGtk::GetThemeProvider() const {
@@ -1488,7 +1490,7 @@
   }
   // Setting the WidgetKey property to widget_, which is used by
   // GetWidgetFromNativeWindow.
-  SetNativeWindowProperty(kWidgetKey, this);
+  SetNativeWindowProperty(kWidgetWideKey, this);
 }
 
 void WidgetGtk::ConfigureWidgetForTransparentBackground(GtkWidget* parent) {