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

views/widget/widget_gtk.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/widget/widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 
@@ skipping 14 matching lines @@
 #include "views/widget/gtk_views_window.h"
 #include "views/widget/root_view.h"
 #include "views/widget/tooltip_manager_gtk.h"
 #include "views/widget/widget_delegate.h"
 #include "views/window/window_gtk.h"
 
 namespace {
 
 // 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
 // is composited to a GtkWidget. gtk_widget_is_composited simply tells
 // if x11 supports composition and cannot be used to tell if given widget
 // is composited.
 const char* kCompositeEnabledKey = "__VIEWS_COMPOSITE_ENABLED__";
 
 // CompositePainter draws a composited child widgets image into its
 // drawing area. This object is created at most once for a widget and kept
@@ skipping 750 matching lines @@
 }
 
 Window* WidgetGtk::GetWindow() {
   return GetWindowImpl(widget_);
 }
 
 const Window* WidgetGtk::GetWindow() const {
   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 {
   return default_theme_provider_.get();
 }
 
 ThemeProvider* WidgetGtk::GetDefaultThemeProvider() const {
   return default_theme_provider_.get();
 }
 
@@ skipping 660 matching lines @@
     if (ignore_events_)
       ConfigureWidgetForIgnoreEvents();
 
     SetAlwaysOnTop(always_on_top_);
     // The widget needs to be realized before handlers like size-allocate can
     // function properly.
     gtk_widget_realize(widget_);
   }
   // Setting the WidgetKey property to widget_, which is used by
   // GetWidgetFromNativeWindow.
-  SetNativeWindowProperty(kWidgetKey, this);
+  SetNativeWindowProperty(kWidgetWideKey, this);
 }
 
 void WidgetGtk::ConfigureWidgetForTransparentBackground(GtkWidget* parent) {
   DCHECK(widget_ && window_contents_);
 
   GdkColormap* rgba_colormap =
       gdk_screen_get_rgba_colormap(gtk_widget_get_screen(widget_));
   if (!rgba_colormap) {
     transparent_ = false;
     return;
@@ skipping 152 matching lines @@
     GtkWindow* window = GTK_WINDOW(element->data);
     DCHECK(window);
     RootView *root_view = FindRootView(window);
     if (root_view)
       root_view->NotifyLocaleChanged();
   }
   g_list_free(window_list);
 }
 
 }  // namespace views